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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index ffc08f5..048d225 100644 (file)
--- 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 755af1a..713a4c2 100644 (file)
--- 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 986e0f0..43243f8 100644 (file)
--- 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 */