diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-12-16 20:43:39 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-12-16 20:43:39 +0000 |
| commit | 1dd488e9559bbe411c6933fd8ff02450a4b3be7e (patch) | |
| tree | 902badb19fe2a5f851802994fdf329c1b206a0f8 /libavcodec | |
| parent | 89db0bae260ca55eaa054fa4ff63ea76ade41560 (diff) | |
Move ENABLE_SMALL back to the per MB check, as otherwise gcc wont remove
the code.
Originally committed as revision 16173 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index dab2d07f38..91b2fa5a10 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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 AVCodecContext *avctx, void *arg){ 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; |