summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2010-05-29 15:07:08 +0000
committerReinhard Tartler <siretart@tauware.de>2010-05-29 15:07:08 +0000
commitf7f9f18f8394806b2e11b1a4412f8c4847332fcb (patch)
treed07d660f21ea13c5f25ed2bfa40c73c1d3014054
parent55291e37f550097171f7a11871f522580dbf1be5 (diff)
Treat SIPP like xvid, fixed issue1966
backport r23336 by michael Originally committed as revision 23385 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
-rw-r--r--libavcodec/h263dec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index f5df5560c5..c80cfcfa2d 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -428,7 +428,9 @@ retry:
if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){
if(s->stream_codec_tag == AV_RL32("XVID") ||
s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") ||
- s->codec_tag == AV_RL32("RMP4"))
+ s->codec_tag == AV_RL32("RMP4") ||
+ s->codec_tag == AV_RL32("SIPP")
+ )
s->xvid_build= 0;
#if 0
if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1