diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-09-10 23:40:55 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-09-10 23:40:55 +0000 |
| commit | 541ae14095cf7757bc5034a6d09f9a41e385802d (patch) | |
| tree | 96e12e8bdbcb311ddf8e6ae02c98e7186e9488e7 /libavcodec/h263dec.c | |
| parent | cb0c448a8d026fe7fec546837d87e5d258f42123 (diff) | |
| download | ffmpeg-541ae14095cf7757bc5034a6d09f9a41e385802d.tar.gz | |
AVI stream header FCC / more reliable detection of old xvid files
Originally committed as revision 2258 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 3701aa51f2..4778851267 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -482,13 +482,17 @@ retry: avctx->has_b_frames= !s->low_delay; if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ - if(s->avctx->codec_tag == ff_get_fourcc("XVID") || s->avctx->codec_tag == ff_get_fourcc("XVIX")) + if(s->avctx->stream_codec_tag == ff_get_fourcc("XVID") || + s->avctx->codec_tag == ff_get_fourcc("XVID") || s->avctx->codec_tag == ff_get_fourcc("XVIX")) s->xvid_build= -1; - +#if 0 if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc s->xvid_build= -1; +#endif + } + if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==0) s->divx_version= 400; //divx 4 } |