From 2952d13ad55da8c091f1fdafb1511b15d02e5125 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 1 Aug 2007 20:04:12 +0000 Subject: [PATCH] merge another 2 if() to save a few cpu cycles Originally committed as revision 9858 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpeg12.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 24e1228882..66eb154bb7 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -497,14 +497,11 @@ static int mpeg_decode_mb(MpegEncContext *s, if (HAS_CBP(mb_type)) { s->dsp.clear_blocks(s->block[0]); - if(!s->chroma_y_shift){ - s->dsp.clear_blocks(s->block[6]); - } - cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1); if(mb_block_count > 6){ cbp<<= mb_block_count-6; cbp |= get_bits(&s->gb, mb_block_count-6); + s->dsp.clear_blocks(s->block[6]); } if (cbp <= 0){ av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y);