comparison h263dec.c @ 1458:40b69d238beb libavcodec

AVI stream header FCC / more reliable detection of old xvid files
author michaelni
date Wed, 10 Sep 2003 23:40:55 +0000
parents 460e5ead6722
children c7858e2bd1c1
comparison
equal deleted inserted replaced
1457:460e5ead6722 1458:40b69d238beb
480 } 480 }
481 481
482 avctx->has_b_frames= !s->low_delay; 482 avctx->has_b_frames= !s->low_delay;
483 483
484 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ 484 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){
485 if(s->avctx->codec_tag == ff_get_fourcc("XVID") || s->avctx->codec_tag == ff_get_fourcc("XVIX")) 485 if(s->avctx->stream_codec_tag == ff_get_fourcc("XVID") ||
486 s->avctx->codec_tag == ff_get_fourcc("XVID") || s->avctx->codec_tag == ff_get_fourcc("XVIX"))
486 s->xvid_build= -1; 487 s->xvid_build= -1;
487 488 #if 0
488 if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 489 if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1
489 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc 490 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc
490 s->xvid_build= -1; 491 s->xvid_build= -1;
491 492 #endif
493 }
494
495 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){
492 if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==0) 496 if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==0)
493 s->divx_version= 400; //divx 4 497 s->divx_version= 400; //divx 4
494 } 498 }
495 499
496 if(s->workaround_bugs&FF_BUG_AUTODETECT){ 500 if(s->workaround_bugs&FF_BUG_AUTODETECT){