diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-08-01 20:04:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-08-01 20:04:12 +0000 |
| commit | 2952d13ad55da8c091f1fdafb1511b15d02e5125 (patch) | |
| tree | c170677732b2761acd5100f8f2343068d37685fb /libavcodec/mpeg12.c | |
| parent | 09d1bee89e27ee2991f3aee5db38ba251f2fac95 (diff) | |
| download | ffmpeg-2952d13ad55da8c091f1fdafb1511b15d02e5125.tar.gz | |
merge another 2 if() to save a few cpu cycles
Originally committed as revision 9858 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 5 |
1 files changed, 1 insertions, 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); |