From df32bc1213ae29fc6f7e0e724e59f55dd39ae40d Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Thu, 21 Dec 2006 22:58:02 +0000
Subject: [PATCH] more simplification
Originally committed as revision 7352 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/mpegvideo.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 4690380a0e8..1c4ba3d40c2 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -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)
--
GitLab