1. ffmpeg
  2. Commit 4d9c044d47f8961852ae5735e5843a3b8a79a3b1
Browse code

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)

Anton Khirnov authored on 2011/02/03 22:34:00
Showing 5 changed files
libavcodec/aacdec.c
History View file @ 4d9c044
... ... 
@@ -2363,7 +2363,7 @@ AVCodec ff_aac_decoder = {
2363 2363 
 */
2364 2364 
 AVCodec ff_aac_latm_decoder = {
2365 2365 
     .name = "aac_latm",
2366 
-    .type = CODEC_TYPE_AUDIO,
2366 
+    .type = AVMEDIA_TYPE_AUDIO,
2367 2367 
     .id   = CODEC_ID_AAC_LATM,
2368 2368 
     .priv_data_size = sizeof(struct LATMContext),
2369 2369 
     .init   = latm_decode_init,
libavcodec/amrwbdec.c
History View file @ 4d9c044
... ... 
@@ -1227,7 +1227,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
1227 1227
1228 1228 
 AVCodec ff_amrwb_decoder = {
1229 1229 
     .name           = "amrwb",
1230 
-    .type           = CODEC_TYPE_AUDIO,
1230 
+    .type           = AVMEDIA_TYPE_AUDIO,
1231 1231 
     .id             = CODEC_ID_AMR_WB,
1232 1232 
     .priv_data_size = sizeof(AMRWBContext),
1233 1233 
     .init           = amrwb_decode_init,
libavcodec/lagarith.c
History View file @ 4d9c044
... ... 
@@ -510,7 +510,7 @@ static av_cold int lag_decode_end(AVCodecContext *avctx)
510 510
511 511 
 AVCodec ff_lagarith_decoder = {
512 512 
     "lagarith",
513 
-    CODEC_TYPE_VIDEO,
513 
+    AVMEDIA_TYPE_VIDEO,
514 514 
     CODEC_ID_LAGARITH,
515 515 
     sizeof(LagarithContext),
516 516 
     lag_decode_init,
libavformat/ivfenc.c
History View file @ 4d9c044
... ... 
@@ -30,7 +30,7 @@ static int ivf_write_header(AVFormatContext *s)
30 30 
         return AVERROR(EINVAL);
31 31 
     }
32 32 
     ctx = s->streams[0]->codec;
33 
-    if (ctx->codec_type != CODEC_TYPE_VIDEO || ctx->codec_id != CODEC_ID_VP8) {
33 
+    if (ctx->codec_type != AVMEDIA_TYPE_VIDEO || ctx->codec_id != CODEC_ID_VP8) {
34 34 
         av_log(s, AV_LOG_ERROR, "Currently only VP8 is supported!\n");
35 35 
         return AVERROR(EINVAL);
36 36 
     }
libavformat/rtpdec_qt.c
History View file @ 4d9c044
... ... 
@@ -104,9 +104,9 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
104 104
105 105 
         url_fseek(&pb, pos + 4, SEEK_SET);
106 106 
         tag = get_le32(&pb);
107 
-        if ((st->codec->codec_type == CODEC_TYPE_VIDEO &&
107 
+        if ((st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
108 108 
                  tag != MKTAG('v','i','d','e')) ||
109 
-            (st->codec->codec_type == CODEC_TYPE_AUDIO &&
109 
+            (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
110 110 
                  tag != MKTAG('s','o','u','n')))
111 111 
             return AVERROR_INVALIDDATA;
112 112 
         av_set_pts_info(st, 32, 1, get_be32(&pb));
... ... 
@@ -248,7 +248,7 @@ RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \
248 248 
     .parse_packet     = qt_rtp_parse_packet, \
249 249 
 };
250 250
251 
-RTP_QT_HANDLER(qt,        vid, "X-QT",        CODEC_TYPE_VIDEO);
252 
-RTP_QT_HANDLER(qt,        aud, "X-QT",        CODEC_TYPE_AUDIO);
253 
-RTP_QT_HANDLER(quicktime, vid, "X-QUICKTIME", CODEC_TYPE_VIDEO);
254 
-RTP_QT_HANDLER(quicktime, aud, "X-QUICKTIME", CODEC_TYPE_AUDIO);
251 
+RTP_QT_HANDLER(qt,        vid, "X-QT",        AVMEDIA_TYPE_VIDEO);
252 
+RTP_QT_HANDLER(qt,        aud, "X-QT",        AVMEDIA_TYPE_AUDIO);
253 
+RTP_QT_HANDLER(quicktime, vid, "X-QUICKTIME", AVMEDIA_TYPE_VIDEO);
254 
+RTP_QT_HANDLER(quicktime, aud, "X-QUICKTIME", AVMEDIA_TYPE_AUDIO);