diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 13:34:00 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-02-03 13:37:09 +0000 |
| commit | b2ed95ec48aceb21a9bb47af85d259ee52b8b7ea (patch) | |
| tree | 7ade83a79c7c9c7fc5d71b2b6f72f8b0ef86b2e0 | |
| parent | 1f56f5ed6d68f6492e213944e145e04e4d4dca13 (diff) | |
| download | ffmpeg-b2ed95ec48aceb21a9bb47af85d259ee52b8b7ea.tar.gz | |
Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*
Tested to compile with lavc major bump.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/aacdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/amrwbdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/lagarith.c | 2 | ||||
| -rw-r--r-- | libavformat/ivfenc.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpdec_qt.c | 12 |
5 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 411c1dfc1b..bc92f5662f 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2363,7 +2363,7 @@ AVCodec ff_aac_decoder = { */ AVCodec ff_aac_latm_decoder = { .name = "aac_latm", - .type = CODEC_TYPE_AUDIO, + .type = AVMEDIA_TYPE_AUDIO, .id = CODEC_ID_AAC_LATM, .priv_data_size = sizeof(struct LATMContext), .init = latm_decode_init, diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 8bf02a2b10..1735c29ccc 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1227,7 +1227,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVCodec ff_amrwb_decoder = { .name = "amrwb", - .type = CODEC_TYPE_AUDIO, + .type = AVMEDIA_TYPE_AUDIO, .id = CODEC_ID_AMR_WB, .priv_data_size = sizeof(AMRWBContext), .init = amrwb_decode_init, diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 89580dc159..d53cd05c6b 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -510,7 +510,7 @@ static av_cold int lag_decode_end(AVCodecContext *avctx) AVCodec ff_lagarith_decoder = { "lagarith", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_LAGARITH, sizeof(LagarithContext), lag_decode_init, diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c index b3b28419f1..021eb5163a 100644 --- a/libavformat/ivfenc.c +++ b/libavformat/ivfenc.c @@ -30,7 +30,7 @@ static int ivf_write_header(AVFormatContext *s) return AVERROR(EINVAL); } ctx = s->streams[0]->codec; - if (ctx->codec_type != CODEC_TYPE_VIDEO || ctx->codec_id != CODEC_ID_VP8) { + if (ctx->codec_type != AVMEDIA_TYPE_VIDEO || ctx->codec_id != CODEC_ID_VP8) { av_log(s, AV_LOG_ERROR, "Currently only VP8 is supported!\n"); return AVERROR(EINVAL); } 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); |