aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2006-12-21 22:58:02 +0000
committerAurelien Jacobs <aurel@gnuage.org>2006-12-21 22:58:02 +0000
commitdf32bc1213ae29fc6f7e0e724e59f55dd39ae40d (patch)
treef89c904a43861be4079b0b50f6c79838f28fb61f /libavcodec
parentacff54d83128e955bad5563196ffee943d7df0cd (diff)
downloadffmpeg-df32bc1213ae29fc6f7e0e724e59f55dd39ae40d.tar.gz
more simplification
Originally committed as revision 7352 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegvideo.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 4690380a0e..1c4ba3d40c 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)