[SCM] libav/experimental: merge another 2 if() to save a few cpu cycles

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2952d13ad55da8c091f1fdafb1511b15d02e5125
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Aug 1 20:04:12 2007 +0000

    merge another 2 if() to save a few cpu cycles
    
    Originally committed as revision 9858 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 24e1228..66eb154 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);

-- 
Libav/FFmpeg packaging