diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 13:34:00 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-04 03:10:12 +0100 |
| commit | 4d9c044d47f8961852ae5735e5843a3b8a79a3b1 (patch) | |
| tree | aeae329c0ac3cec51480e0a1e29475d0338d957c /libavformat/rtpdec_qt.c | |
| parent | a991b8dec654ad09a35494e0cabbbc157bb04dab (diff) | |
Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*
Tested to compile with lavc major bump.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit b2ed95ec48aceb21a9bb47af85d259ee52b8b7ea)
Diffstat (limited to 'libavformat/rtpdec_qt.c')
| -rw-r--r-- | libavformat/rtpdec_qt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index 5cca076079..28460a7ad9 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -104,9 +104,9 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, url_fseek(&pb, pos + 4, SEEK_SET); tag = get_le32(&pb); - if ((st->codec->codec_type == CODEC_TYPE_VIDEO && + if ((st->codec->codec_type == AVMEDIA_TYPE_VIDEO && tag != MKTAG('v','i','d','e')) || - (st->codec->codec_type == CODEC_TYPE_AUDIO && + (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && tag != MKTAG('s','o','u','n'))) return AVERROR_INVALIDDATA; av_set_pts_info(st, 32, 1, get_be32(&pb)); @@ -248,7 +248,7 @@ RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \ .parse_packet = qt_rtp_parse_packet, \ }; -RTP_QT_HANDLER(qt, vid, "X-QT", CODEC_TYPE_VIDEO); -RTP_QT_HANDLER(qt, aud, "X-QT", CODEC_TYPE_AUDIO); -RTP_QT_HANDLER(quicktime, vid, "X-QUICKTIME", CODEC_TYPE_VIDEO); -RTP_QT_HANDLER(quicktime, aud, "X-QUICKTIME", CODEC_TYPE_AUDIO); +RTP_QT_HANDLER(qt, vid, "X-QT", AVMEDIA_TYPE_VIDEO); +RTP_QT_HANDLER(qt, aud, "X-QT", AVMEDIA_TYPE_AUDIO); +RTP_QT_HANDLER(quicktime, vid, "X-QUICKTIME", AVMEDIA_TYPE_VIDEO); +RTP_QT_HANDLER(quicktime, aud, "X-QUICKTIME", AVMEDIA_TYPE_AUDIO); |