diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2008-07-02 22:03:53 +0000 |
|---|---|---|
| committer | Alexander Strange <astrange@ithinksw.com> | 2008-07-02 22:03:53 +0000 |
| commit | 2e254bc583de429e05b8a4d22c6a68658befac9c (patch) | |
| tree | 5efa3fb7380d324a9d6117e1ce0830b2a59017a3 /libavcodec | |
| parent | fedec603db2b673d122244691c950df07df95222 (diff) | |
| download | ffmpeg-2e254bc583de429e05b8a4d22c6a68658befac9c.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |