Mercurial > libavcodec.hg
comparison h263dec.c @ 8612:b20c590170cc libavcodec
remove ff_get_fourcc() and use AV_RL32() instead
| author | aurel |
|---|---|
| date | Sat, 17 Jan 2009 12:21:01 +0000 |
| parents | 68e959302527 |
| children | 04423b2f6e0b |
comparison
equal
deleted
inserted
replaced
| 8611:a637db9f59b1 | 8612:b20c590170cc |
|---|---|
| 419 } | 419 } |
| 420 | 420 |
| 421 avctx->has_b_frames= !s->low_delay; | 421 avctx->has_b_frames= !s->low_delay; |
| 422 | 422 |
| 423 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ | 423 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ |
| 424 if(s->stream_codec_tag == ff_get_fourcc("XVID") || | 424 if(s->stream_codec_tag == AV_RL32("XVID") || |
| 425 s->codec_tag == ff_get_fourcc("XVID") || s->codec_tag == ff_get_fourcc("XVIX") || | 425 s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") || |
| 426 s->codec_tag == ff_get_fourcc("RMP4")) | 426 s->codec_tag == AV_RL32("RMP4")) |
| 427 s->xvid_build= -1; | 427 s->xvid_build= -1; |
| 428 #if 0 | 428 #if 0 |
| 429 if(s->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 | 429 if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 |
| 430 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc | 430 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc |
| 431 s->xvid_build= -1; | 431 s->xvid_build= -1; |
| 432 #endif | 432 #endif |
| 433 } | 433 } |
| 434 | 434 |
| 435 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ | 435 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ |
| 436 if(s->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==0) | 436 if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==0) |
| 437 s->divx_version= 400; //divx 4 | 437 s->divx_version= 400; //divx 4 |
| 438 } | 438 } |
| 439 | 439 |
| 440 if(s->xvid_build && s->divx_version){ | 440 if(s->xvid_build && s->divx_version){ |
| 441 s->divx_version= | 441 s->divx_version= |
| 442 s->divx_build= 0; | 442 s->divx_build= 0; |
| 443 } | 443 } |
| 444 | 444 |
| 445 if(s->workaround_bugs&FF_BUG_AUTODETECT){ | 445 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
| 446 if(s->codec_tag == ff_get_fourcc("XVIX")) | 446 if(s->codec_tag == AV_RL32("XVIX")) |
| 447 s->workaround_bugs|= FF_BUG_XVID_ILACE; | 447 s->workaround_bugs|= FF_BUG_XVID_ILACE; |
| 448 | 448 |
| 449 if(s->codec_tag == ff_get_fourcc("UMP4")){ | 449 if(s->codec_tag == AV_RL32("UMP4")){ |
| 450 s->workaround_bugs|= FF_BUG_UMP4; | 450 s->workaround_bugs|= FF_BUG_UMP4; |
| 451 } | 451 } |
| 452 | 452 |
| 453 if(s->divx_version>=500 && s->divx_build<1814){ | 453 if(s->divx_version>=500 && s->divx_build<1814){ |
| 454 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; | 454 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; |