more simplification
authorAurelien Jacobs <aurel@gnuage.org>
Thu, 21 Dec 2006 22:58:02 +0000 (22:58 +0000)
committerAurelien Jacobs <aurel@gnuage.org>
Thu, 21 Dec 2006 22:58:02 +0000 (22:58 +0000)
Originally committed as revision 7352 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/mpegvideo.c

index 4690380..1c4ba3d 100644 (file)
@@ -4349,9 +4349,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x,
                 if(s->codec_id==CODEC_ID_MPEG4){
                     if(!s->mb_intra){
                         if(s->pict_type == B_TYPE){
-                            if(s->dquant&1)
-                                s->dquant= 0;
-                            if(s->mv_dir&MV_DIRECT)
+                            if(s->dquant&1 || s->mv_dir&MV_DIRECT)
                                 s->dquant= 0;
                         }
                         if(s->mv_type==MV_TYPE_8X8)