From 2e254bc583de429e05b8a4d22c6a68658befac9c Mon Sep 17 00:00:00 2001 From: Alexander Strange Date: Wed, 2 Jul 2008 22:03:53 +0000 Subject: [PATCH] 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 --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2be9a77fc8..b667547a14 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;