diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-12-14 20:04:00 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-12-14 20:04:00 +0000 |
| commit | 7a961a46ba28e49f88ff0e81b96395c96b424634 (patch) | |
| tree | 81d22ac4380a5cf025ddf9c5045193abf32342f9 | |
| parent | 335a761a908bedc7b8b488d04890bcfe36bb812f (diff) | |
| download | ffmpeg-7a961a46ba28e49f88ff0e81b96395c96b424634.tar.gz | |
Make register_avcodec() call avcodec_init().
This avoids the possibility to use a registered codec without first
initializing libavcodec, which resulted in unexpected behavior.
Originally committed as revision 16131 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ffc08f50e6..048d225844 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -31,7 +31,7 @@ #define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MINOR 6 -#define LIBAVCODEC_VERSION_MICRO 1 +#define LIBAVCODEC_VERSION_MICRO 2 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 755af1ac62..713a4c298a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -90,6 +90,7 @@ AVCodec *av_codec_next(AVCodec *c){ void register_avcodec(AVCodec *codec) { AVCodec **p; + avcodec_init(); p = &first_avcodec; while (*p != NULL) p = &(*p)->next; *p = codec; diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 986e0f07da..43243f8062 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -50,7 +50,6 @@ void av_register_all(void) return; initialized = 1; - avcodec_init(); avcodec_register_all(); /* (de)muxers */ |