# HG changeset patch # User michael # Date 1229460219 0 # Node ID 5e6f6518188145237df6ac7cbd36efed210aa358 # Parent add1a0d6537004031355253743e5bd9debfeea6a Move ENABLE_SMALL back to the per MB check, as otherwise gcc wont remove the code. diff -r add1a0d65370 -r 5e6f65181881 h264.c --- a/h264.c Tue Dec 16 20:26:22 2008 +0000 +++ b/h264.c Tue Dec 16 20:43:39 2008 +0000 @@ -2610,7 +2610,7 @@ 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 @@ 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;