[SCM] libav/experimental: Don't generate two copies of hl_decode_mb() under ENABLE_SMALL. (assuming your compiler removes unused static functions)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2e254bc583de429e05b8a4d22c6a68658befac9c
Author: Alexander Strange <astrange at ithinksw.com>
Date:   Wed Jul 2 22:03:53 2008 +0000

    Don't generate two copies of hl_decode_mb() under ENABLE_SMALL.
    (assuming your compiler removes unused static functions)
    
    Originally committed as revision 14049 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2be9a77..b667547 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2726,7 +2726,7 @@ static void hl_decode_mb(H264Context *h){
     MpegEncContext * const s = &h->s;
     const int mb_xy= h->mb_xy;
     const int mb_type= s->current_picture.mb_type[mb_xy];
-    int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding);
+    int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding) || ENABLE_SMALL;
 
     if(ENABLE_H264_ENCODER && !s->decode)
         return;

-- 
Libav/FFmpeg packaging