generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge another 2 if() to save a few cpu cycles

Browse Source 
Originally committed as revision 9858 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-08-01 20:04:12 +00:00
parent 09d1bee89e
commit 2952d13ad5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpeg12.c
View File

@ -497,14 +497,11 @@ static int mpeg_decode_mb(MpegEncContext *s,
if (HAS_CBP(mb_type)) { if (HAS_CBP(mb_type)) {
s->dsp.clear_blocks(s->block[0]); 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); cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1);
if(mb_block_count > 6){ if(mb_block_count > 6){
cbp<<= mb_block_count-6; cbp<<= mb_block_count-6;
cbp |= get_bits(&s->gb, mb_block_count-6); cbp |= get_bits(&s->gb, mb_block_count-6);
s->dsp.clear_blocks(s->block[6]);
} }
if (cbp <= 0){ if (cbp <= 0){
av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y); av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y);