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 /libavformat | |
| parent | 9ce6c1387988bf3cdb631f3844e99a0c9bea43f2 (diff) | |
remove ff_get_fourcc() and use AV_RL32() instead
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 3 | ||||
| -rw-r--r-- | libavformat/tta.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 128614be50..693bdc2053 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -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 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) 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; } diff --git a/libavformat/tta.c b/libavformat/tta.c index 884664c98d..bf0f7e32c1 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -41,7 +41,7 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap) 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 diff --git a/libavformat/utils.c b/libavformat/utils.c index 1778bba973..ce35fbe8a3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1946,8 +1946,8 @@ static int get_std_framerate(int i){ 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; |