[Ffmpeg-cvslog] r7352 - trunk/libavcodec/mpegvideo.c

[aurel]

Author: aurel
Date: Thu Dec 21 23:58:02 2006
New Revision: 7352

Modified:
   trunk/libavcodec/mpegvideo.c

Log:
more simplification

Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	(original)
+++ trunk/libavcodec/mpegvideo.c	Thu Dec 21 23:58:02 2006
@@ -4349,9 +4349,7 @@
                 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)