diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-17 12:21:01 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-17 12:21:01 +0000 |
commit | 2bb6eba21d1843d67127be031aab7576dbe4c200 (patch) | |
tree | 58da36fa398f13d1c6916e14af466f28ea735ce4 /libavcodec/h263dec.c | |
parent | 9ce6c1387988bf3cdb631f3844e99a0c9bea43f2 (diff) | |
download | ffmpeg-2bb6eba21d1843d67127be031aab7576dbe4c200.tar.gz |
remove ff_get_fourcc() and use AV_RL32() instead
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r-- | libavcodec/h263dec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 557124e172..2792ba26f4 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -421,19 +421,19 @@ retry: avctx->has_b_frames= !s->low_delay; if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ - if(s->stream_codec_tag == ff_get_fourcc("XVID") || - s->codec_tag == ff_get_fourcc("XVID") || s->codec_tag == ff_get_fourcc("XVIX") || - s->codec_tag == ff_get_fourcc("RMP4")) + 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->xvid_build= -1; #if 0 - if(s->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 + if(s->codec_tag == AV_RL32("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->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==0) + if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==0) s->divx_version= 400; //divx 4 } @@ -443,10 +443,10 @@ retry: } if(s->workaround_bugs&FF_BUG_AUTODETECT){ - if(s->codec_tag == ff_get_fourcc("XVIX")) + if(s->codec_tag == AV_RL32("XVIX")) s->workaround_bugs|= FF_BUG_XVID_ILACE; - if(s->codec_tag == ff_get_fourcc("UMP4")){ + if(s->codec_tag == AV_RL32("UMP4")){ s->workaround_bugs|= FF_BUG_UMP4; } |