# HG changeset patch
# User michael
# Date 1185998652 0
# Node ID cfbb6ab18f896385107c90f086bfac3b949e3408
# Parent  f1db308c277b7182d6bfde3f00e35cf46b9fae76
merge another 2 if() to save a few cpu cycles

diff -r f1db308c277b -r cfbb6ab18f89 mpeg12.c
--- a/mpeg12.c	Wed Aug 01 19:37:28 2007 +0000
+++ b/mpeg12.c	Wed Aug 01 20:04:12 2007 +0000
@@ -497,14 +497,11 @@
         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);