mirror of https://git.ffmpeg.org/ffmpeg.git
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
This commit is contained in:
parent
fedec603db
commit
2e254bc583
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue