[FFmpeg-cvslog] r16173 - trunk/libavcodec/h264.c

[michael]

Author: michael
Date: Tue Dec 16 21:43:39 2008
New Revision: 16173

Log:
Move ENABLE_SMALL back to the per MB check, as otherwise gcc wont remove
the code.


Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Tue Dec 16 21:43:39 2008
@@ -2610,7 +2610,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 = h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
+    int is_complex = ENABLE_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
 
     if(ENABLE_H264_ENCODER && !s->decode)
         return;
@@ -6572,7 +6572,7 @@ static int decode_slice(struct AVCodecCo
     s->mb_skip_run= -1;
 
     h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 ||
-                    (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding) || ENABLE_SMALL;
+                    (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding);
 
     if( h->pps.cabac ) {
         int i;