Originally committed as revision 23336 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -428,7 +428,9 @@ retry: · 427 unmodified lines | |||
| 428 | if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){ | 428 | if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){ |
| 429 | if(s->stream_codec_tag == AV_RL32("XVID") || | 429 | if(s->stream_codec_tag == AV_RL32("XVID") || |
| 430 | s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") || | 430 | s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") || |
| 431 | s->codec_tag == AV_RL32("RMP4")) | 431 | s->codec_tag == AV_RL32("RMP4") || |
| 432 | s->codec_tag == AV_RL32("SIPP") | ||
| 433 | ) | ||
| 432 | s->xvid_build= 0; | 434 | s->xvid_build= 0; |
| 433 | #if 0 | 435 | #if 0 |
| 434 | if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 | 436 | if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 |