[SCM] libav/experimental: cosmetics: Move one code block to save an #ifdef in the next commit.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:58:44 UTC 2013


The following commit has been merged in the experimental branch:
commit 6f6a3e2acba7e7a6e35a925289fb06bcb01db99d
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sun Apr 8 18:52:03 2007 +0000

    cosmetics: Move one code block to save an #ifdef in the next commit.
    
    Originally committed as revision 8684 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 30ac2b1..5c5c6f2 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2611,30 +2611,30 @@ static int theora_decode_init(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec vp3_decoder = {
-    "vp3",
+#ifdef CONFIG_THEORA_DECODER
+AVCodec theora_decoder = {
+    "theora",
     CODEC_TYPE_VIDEO,
-    CODEC_ID_VP3,
+    CODEC_ID_THEORA,
     sizeof(Vp3DecodeContext),
-    vp3_decode_init,
+    theora_decode_init,
     NULL,
     vp3_decode_end,
     vp3_decode_frame,
     0,
     NULL
 };
+#endif
 
-#ifdef CONFIG_THEORA_DECODER
-AVCodec theora_decoder = {
-    "theora",
+AVCodec vp3_decoder = {
+    "vp3",
     CODEC_TYPE_VIDEO,
-    CODEC_ID_THEORA,
+    CODEC_ID_VP3,
     sizeof(Vp3DecodeContext),
-    theora_decode_init,
+    vp3_decode_init,
     NULL,
     vp3_decode_end,
     vp3_decode_frame,
     0,
     NULL
 };
-#endif

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list