From 0ac6b5a301004dd7b4b344d24d58126b733167ba Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 1 Aug 2007 19:26:24 +0000 Subject: merge/simplify 2 if() ~4 cpu cylces faster for the matrixbench video Originally committed as revision 9856 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpeg12.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libavcodec/mpeg12.c') diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index f0cbd8e7d6..09c90e81df 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)) -- cgit v1.2.3