diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-08-01 19:26:24 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-08-01 19:26:24 +0000 |
| commit | 0ac6b5a301004dd7b4b344d24d58126b733167ba (patch) | |
| tree | f8d232f8de625a222be10bc4eda46d8b18966b4c /libavcodec/mpeg12.c | |
| parent | fecc146b28b97ae10942c9eabd279f44fb7c18ed (diff) | |
| download | ffmpeg-0ac6b5a301004dd7b4b344d24d58126b733167ba.tar.gz | |
merge/simplify 2 if()
~4 cpu cylces faster for the matrixbench video
Originally committed as revision 9856 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 8 |
1 files changed, 2 insertions, 6 deletions
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)) |