[FFmpeg-cvslog] lavc/utils: move avcodec_init() higher in the file.

Anton Khirnov git at videolan.org
Wed Sep 21 21:34:05 CEST 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Sep  1 16:59:35 2011 +0200| [9ecfbb3e57dc1d46986b9296bf582c8e82b303b6] | committer: Anton Khirnov

lavc/utils: move avcodec_init() higher in the file.

Fixes build on next major bump.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ecfbb3e57dc1d46986b9296bf582c8e82b303b6
---

 libavcodec/utils.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 166fbec..9f198cb 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -85,6 +85,20 @@ AVCodec *av_codec_next(AVCodec *c){
     else  return first_avcodec;
 }
 
+#if !FF_API_AVCODEC_INIT
+static
+#endif
+void avcodec_init(void)
+{
+    static int initialized = 0;
+
+    if (initialized != 0)
+        return;
+    initialized = 1;
+
+    dsputil_static_init();
+}
+
 void avcodec_register(AVCodec *codec)
 {
     AVCodec **p;
@@ -1065,20 +1079,6 @@ const char *avcodec_license(void)
     return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
 
-#if !FF_API_AVCODEC_INIT
-static
-#endif
-void avcodec_init(void)
-{
-    static int initialized = 0;
-
-    if (initialized != 0)
-        return;
-    initialized = 1;
-
-    dsputil_static_init();
-}
-
 void avcodec_flush_buffers(AVCodecContext *avctx)
 {
     if(HAVE_PTHREADS && avctx->active_thread_type&FF_THREAD_FRAME)



More information about the ffmpeg-cvslog mailing list