[SCM] libav/experimental: Remove useless #if 0 code.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:25:38 UTC 2013


The following commit has been merged in the experimental branch:
commit 6b476f05e321f2eddb3f756a0d8d1c5bacb24ff5
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jul 19 10:47:25 2008 +0000

    Remove useless #if 0 code.
    
    Originally committed as revision 14297 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 26d57ac..c4591c8 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7820,9 +7820,6 @@ static int decode_frame(AVCodecContext *avctx,
 
         //FIXME do something with unavailable reference frames
 
-#if 0 //decode order
-            *data_size = sizeof(AVFrame);
-#else
             /* Sort B-frames into display order */
 
             if(h->sps.bitstream_restriction_flag
@@ -7881,7 +7878,6 @@ static int decode_frame(AVCodecContext *avctx,
 
                 h->outputed_poc = out->poc;
             }
-#endif
 
             if(out)
                 *pict= *(AVFrame*)out;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list