From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 1 Aug 2007 19:26:24 +0000 (+0000)
Subject: merge/simplify 2 if()
X-Git-Tag: v0.5~8134
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0ac6b5a301004dd7b4b344d24d58126b733167ba;p=coroid%2Flibav_saccubus.git

merge/simplify 2 if()
~4 cpu cylces faster for the matrixbench video

Originally committed as revision 9856 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index f0cbd8e7d..09c90e81d 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -366,12 +366,8 @@ static int mpeg_decode_mb(MpegEncContext *s,
                 motion_type = MT_FRAME;
             else{
                 motion_type = get_bits(&s->gb, 2);
-            }
-
-            /* compute dct type */
-            if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var?
-                !s->frame_pred_frame_dct && HAS_CBP(mb_type)) {
-                s->interlaced_dct = get_bits1(&s->gb);
+                if (s->picture_structure == PICT_FRAME && HAS_CBP(mb_type))
+                    s->interlaced_dct = get_bits1(&s->gb);
             }
 
             if (IS_QUANT(mb_type))