aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-10-15 11:48:50 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-10-15 11:48:50 +0000
commit45cb4767bc5882c9ba95129cd2bfbeecc36228bb (patch)
tree0ecf83c36d44129ea523a24c39e727126c2406e7
parent035817727fc64430631f3489ee10add63ff6cdc0 (diff)
downloadffmpeg-45cb4767bc5882c9ba95129cd2bfbeecc36228bb.tar.gz
xvid fake divx version workaround
Originally committed as revision 3595 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h263dec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 67d7deede1..b17251555a 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -516,6 +516,11 @@ retry:
if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==0)
s->divx_version= 400; //divx 4
}
+
+ if(s->xvid_build && s->divx_version){
+ s->divx_version=
+ s->divx_build= 0;
+ }
if(s->workaround_bugs&FF_BUG_AUTODETECT){
s->workaround_bugs &= ~FF_BUG_NO_PADDING;