Mercurial > libavformat.hg
changeset 4243:964903243e66 libavformat
remove ff_get_fourcc() and use AV_RL32() instead
| author | aurel |
|---|---|
| date | Sat, 17 Jan 2009 12:21:01 +0000 |
| parents | 44f4dca12784 |
| children | f7c35963d089 |
| files | avidec.c tta.c utils.c |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/avidec.c Sat Jan 17 11:13:33 2009 +0000 +++ b/avidec.c Sat Jan 17 12:21:01 2009 +0000 @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/intreadwrite.h" #include "libavutil/bswap.h" #include "avformat.h" #include "avi.h" @@ -517,7 +518,7 @@ st->need_parsing = AVSTREAM_PARSE_NONE; /* AVI files with Xan DPCM audio (wrongly) declare PCM * audio in the header but have Axan as stream_code_tag. */ - if (st->codec->stream_codec_tag == ff_get_fourcc("Axan")){ + if (st->codec->stream_codec_tag == AV_RL32("Axan")){ st->codec->codec_id = CODEC_ID_XAN_DPCM; st->codec->codec_tag = 0; }
--- a/tta.c Sat Jan 17 11:13:33 2009 +0000 +++ b/tta.c Sat Jan 17 12:21:01 2009 +0000 @@ -41,7 +41,7 @@ int i, channels, bps, samplerate, datalen, framelen; uint64_t framepos; - if (get_le32(s->pb) != ff_get_fourcc("TTA1")) + if (get_le32(s->pb) != AV_RL32("TTA1")) return -1; // not tta file url_fskip(s->pb, 2); // FIXME: flags
--- a/utils.c Sat Jan 17 11:13:33 2009 +0000 +++ b/utils.c Sat Jan 17 12:21:01 2009 +0000 @@ -1946,8 +1946,8 @@ static int tb_unreliable(AVCodecContext *c){ if( c->time_base.den >= 101L*c->time_base.num || c->time_base.den < 5L*c->time_base.num -/* || c->codec_tag == ff_get_fourcc("DIVX") - || c->codec_tag == ff_get_fourcc("XVID")*/ +/* || c->codec_tag == AV_RL32("DIVX") + || c->codec_tag == AV_RL32("XVID")*/ || c->codec_id == CODEC_ID_MPEG2VIDEO) return 1; return 0;