Define AVMediaType enum, and use it instead of enum CodecType, which

is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
author: Stefano Sabatini <stefano.sabatini-lala@poste.it> 2010-03-30 23:30:55 +0000
committer: Stefano Sabatini <stefano.sabatini-lala@poste.it> 2010-03-30 23:30:55 +0000
commit: 72415b2adb2c25f95ceede49001bb97ed9247dbb (patch)
tree: 99247889aa61bb7621c966466ea4b84c100207d3 /libavcodec
parent: ca6e7708b42e7d33ba3053bcd447d52a077bca25 (diff)
download: ffmpeg-72415b2adb2c25f95ceede49001bb97ed9247dbb.tar.gz
226 files changed, 342 insertions, 330 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 92ff9f6d7a..ec25b9b7a9 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -842,7 +842,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
 
 AVCodec fourxm_decoder = {
     "4xm",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_4XM,
     sizeof(FourXContext),
     decode_init,
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index fb5ef71732..be5735f608 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -221,7 +221,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec eightbps_decoder = {
         "8bps",
-        CODEC_TYPE_VIDEO,
+        AVMEDIA_TYPE_VIDEO,
         CODEC_ID_8BPS,
         sizeof(EightBpsContext),
         decode_init,
diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index c139e5d40b..2afd57dce6 100644
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -94,7 +94,7 @@ static av_cold int eightsvx_decode_init(AVCodecContext *avctx)
 
 AVCodec eightsvx_fib_decoder = {
   .name           = "8svx_fib",
-  .type           = CODEC_TYPE_AUDIO,
+  .type           = AVMEDIA_TYPE_AUDIO,
   .id             = CODEC_ID_8SVX_FIB,
   .priv_data_size = sizeof (EightSvxContext),
   .init           = eightsvx_decode_init,
@@ -104,7 +104,7 @@ AVCodec eightsvx_fib_decoder = {
 
 AVCodec eightsvx_exp_decoder = {
   .name           = "8svx_exp",
-  .type           = CODEC_TYPE_AUDIO,
+  .type           = AVMEDIA_TYPE_AUDIO,
   .id             = CODEC_ID_8SVX_EXP,
   .priv_data_size = sizeof (EightSvxContext),
   .init           = eightsvx_decode_init,
diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 26555e9dea..c4636015a7 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -2091,7 +2091,7 @@ static av_cold int aac_decode_close(AVCodecContext *avccontext)
 
 AVCodec aac_decoder = {
     "aac",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AAC,
     sizeof(AACContext),
     aac_decode_init,
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index d32ae5e286..eb32d1464c 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -629,7 +629,7 @@ static av_cold int aac_encode_end(AVCodecContext *avctx)
 
 AVCodec aac_encoder = {
     "aac",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AAC,
     sizeof(AACEncContext),
     aac_encode_init,
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
index 46f64f7e9e..c5e8fd0894 100644
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@@ -111,7 +111,7 @@ static av_cold int aasc_decode_end(AVCodecContext *avctx)
 
 AVCodec aasc_decoder = {
     "aasc",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_AASC,
     sizeof(AascContext),
     aasc_decode_init,
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 1656a4c540..9b1aeeceaa 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -1439,7 +1439,7 @@ static av_cold int ac3_decode_end(AVCodecContext *avctx)
 
 AVCodec ac3_decoder = {
     .name = "ac3",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_AC3,
     .priv_data_size = sizeof (AC3DecodeContext),
     .init = ac3_decode_init,
@@ -1451,7 +1451,7 @@ AVCodec ac3_decoder = {
 #if CONFIG_EAC3_DECODER
 AVCodec eac3_decoder = {
     .name = "eac3",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_EAC3,
     .priv_data_size = sizeof (AC3DecodeContext),
     .init = ac3_decode_init,
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 6f8fe009af..9ff309e7bd 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -1393,7 +1393,7 @@ void test_ac3(void)
 
 AVCodec ac3_encoder = {
     "ac3",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AC3,
     sizeof(AC3EncodeContext),
     AC3_encode_init,
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 6abe18495c..e1234fc1c7 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1638,7 +1638,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
 #define ADPCM_ENCODER(id,name,long_name_)       \
 AVCodec name ## _encoder = {                    \
     #name,                                      \
-    CODEC_TYPE_AUDIO,                           \
+    AVMEDIA_TYPE_AUDIO,                         \
     id,                                         \
     sizeof(ADPCMContext),                       \
     adpcm_encode_init,                          \
@@ -1656,7 +1656,7 @@ AVCodec name ## _encoder = {                    \
 #define ADPCM_DECODER(id,name,long_name_)       \
 AVCodec name ## _decoder = {                    \
     #name,                                      \
-    CODEC_TYPE_AUDIO,                           \
+    AVMEDIA_TYPE_AUDIO,                         \
     id,                                         \
     sizeof(ADPCMContext),                       \
     adpcm_decode_init,                          \
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c
index 94ee793cfa..9828b1beff 100644
--- a/libavcodec/adxdec.c
+++ b/libavcodec/adxdec.c
@@ -168,7 +168,7 @@ static int adx_decode_frame(AVCodecContext *avctx,
 
 AVCodec adpcm_adx_decoder = {
     "adpcm_adx",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ADPCM_ADX,
     sizeof(ADXContext),
     adx_decode_init,
diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index 04e9b789b5..833dde8bd3 100644
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@ -185,7 +185,7 @@ static int adx_encode_frame(AVCodecContext *avctx,
 
 AVCodec adpcm_adx_encoder = {
     "adpcm_adx",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ADPCM_ADX,
     sizeof(ADXContext),
     adx_encode_init,
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 959bc6208a..b896e32bb9 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -701,7 +701,7 @@ static av_cold int alac_decode_close(AVCodecContext *avctx)
 
 AVCodec alac_decoder = {
     "alac",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ALAC,
     sizeof(ALACContext),
     alac_decode_init,
diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c
index 70b3b0f2b1..90c27884db 100644
--- a/libavcodec/alacenc.c
+++ b/libavcodec/alacenc.c
@@ -521,7 +521,7 @@ static av_cold int alac_encode_close(AVCodecContext *avctx)
 
 AVCodec alac_encoder = {
     "alac",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ALAC,
     sizeof(AlacEncodeContext),
     alac_encode_init,
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index c39fced3a1..5050d0bcc9 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1622,7 +1622,7 @@ static av_cold void flush(AVCodecContext *avctx)
 
 AVCodec als_decoder = {
     "als",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MP4ALS,
     sizeof(ALSDecContext),
     decode_init,
diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c
index e5a82b493a..653a03e927 100644
--- a/libavcodec/amrnbdec.c
+++ b/libavcodec/amrnbdec.c
@@ -1071,7 +1071,7 @@ static int amrnb_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
 AVCodec amrnb_decoder = {
     .name           = "amrnb",
-    .type           = CODEC_TYPE_AUDIO,
+    .type           = AVMEDIA_TYPE_AUDIO,
     .id             = CODEC_ID_AMR_NB,
     .priv_data_size = sizeof(AMRContext),
     .init           = amrnb_decode_init,
diff --git a/libavcodec/anm.c b/libavcodec/anm.c
index 963f077194..bccffabad4 100644
--- a/libavcodec/anm.c
+++ b/libavcodec/anm.c
@@ -185,7 +185,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec anm_decoder = {
     "anm",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ANM,
     sizeof(AnmContext),
     decode_init,
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index f7b6e07d6d..9930e2139c 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -879,7 +879,7 @@ static int ape_decode_frame(AVCodecContext * avctx,
 
 AVCodec ape_decoder = {
     "ape",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_APE,
     sizeof(APEContext),
     ape_decode_init,
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 078fc656f6..978e6b68d9 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -615,7 +615,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
 
 AVCodec asv1_decoder = {
     "asv1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ASV1,
     sizeof(ASV1Context),
     decode_init,
@@ -628,7 +628,7 @@ AVCodec asv1_decoder = {
 
 AVCodec asv2_decoder = {
     "asv2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ASV2,
     sizeof(ASV1Context),
     decode_init,
@@ -642,7 +642,7 @@ AVCodec asv2_decoder = {
 #if CONFIG_ASV1_ENCODER
 AVCodec asv1_encoder = {
     "asv1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ASV1,
     sizeof(ASV1Context),
     encode_init,
@@ -656,7 +656,7 @@ AVCodec asv1_encoder = {
 #if CONFIG_ASV2_ENCODER
 AVCodec asv2_encoder = {
     "asv2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ASV2,
     sizeof(ASV1Context),
     encode_init,
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c
index 4954dd8bb5..202ed8f5ea 100644
--- a/libavcodec/atrac1.c
+++ b/libavcodec/atrac1.c
@@ -372,7 +372,7 @@ static av_cold int atrac1_decode_end(AVCodecContext * avctx) {
 
 AVCodec atrac1_decoder = {
     .name = "atrac1",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_ATRAC1,
     .priv_data_size = sizeof(AT1Ctx),
     .init = atrac1_decode_init,
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index dd69e4d87b..aa5a7536a9 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -1016,7 +1016,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
 AVCodec atrac3_decoder =
 {
     .name = "atrac3",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_ATRAC3,
     .priv_data_size = sizeof(ATRAC3Context),
     .init = atrac3_decode_init,
diff --git a/libavcodec/aura.c b/libavcodec/aura.c
index f783010223..dd22328a01 100644
--- a/libavcodec/aura.c
+++ b/libavcodec/aura.c
@@ -124,7 +124,7 @@ static av_cold int aura_decode_end(AVCodecContext *avctx)
 
 AVCodec aura2_decoder = {
     "aura2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_AURA2,
     sizeof(AuraDecodeContext),
     aura_decode_init,
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5a461c623c..2fb4fd49df 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 63
+#define LIBAVCODEC_VERSION_MINOR 64
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -355,16 +355,28 @@ enum CodecID {
                                 * stream (only used by libavformat) */
 };
 
-enum CodecType {
-    CODEC_TYPE_UNKNOWN = -1,
-    CODEC_TYPE_VIDEO,
-    CODEC_TYPE_AUDIO,
-    CODEC_TYPE_DATA,
-    CODEC_TYPE_SUBTITLE,
-    CODEC_TYPE_ATTACHMENT,
-    CODEC_TYPE_NB
+enum AVMediaType {
+    AVMEDIA_TYPE_UNKNOWN = -1,
+    AVMEDIA_TYPE_VIDEO,
+    AVMEDIA_TYPE_AUDIO,
+    AVMEDIA_TYPE_DATA,
+    AVMEDIA_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_ATTACHMENT,
+    AVMEDIA_TYPE_NB
 };
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
+#define CodecType AVMediaType
+
+#define CODEC_TYPE_UNKNOWN    AVMEDIA_TYPE_UNKNOWN
+#define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO
+#define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO
+#define CODEC_TYPE_DATA       AVMEDIA_TYPE_DATA
+#define CODEC_TYPE_SUBTITLE   AVMEDIA_TYPE_SUBTITLE
+#define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
+#define CODEC_TYPE_NB         AVMEDIA_TYPE_NB
+#endif
+
 /**
  * all in native-endian format
  */
@@ -1277,7 +1289,7 @@ typedef struct AVCodecContext {
     void *opaque;
 
     char codec_name[32];
-    enum CodecType codec_type; /* see CODEC_TYPE_xxx */
+    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
     enum CodecID codec_id; /* see CODEC_ID_xxx */
 
     /**
@@ -2657,7 +2669,7 @@ typedef struct AVCodec {
      * This is the primary way to find a codec from the user perspective.
      */
     const char *name;
-    enum CodecType type;
+    enum AVMediaType type;
     enum CodecID id;
     int priv_data_size;
     int (*init)(AVCodecContext *);
@@ -2701,9 +2713,9 @@ typedef struct AVHWAccel {
     /**
      * Type of codec implemented by the hardware accelerator.
      *
-     * See CODEC_TYPE_xxx
+     * See AVMEDIA_TYPE_xxx
      */
-    enum CodecType type;
+    enum AVMediaType type;
 
     /**
      * Codec implemented by the hardware accelerator.
@@ -3241,7 +3253,7 @@ void avcodec_get_context_defaults(AVCodecContext *s);
 
 /** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
  *  we WILL change its arguments and name a few times! */
-void avcodec_get_context_defaults2(AVCodecContext *s, enum CodecType);
+void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
 
 /**
  * Allocates an AVCodecContext and sets its fields to default values.  The
@@ -3254,7 +3266,7 @@ AVCodecContext *avcodec_alloc_context(void);
 
 /** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
  *  we WILL change its arguments and name a few times! */
-AVCodecContext *avcodec_alloc_context2(enum CodecType);
+AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
 
 /**
  * Sets the fields of the given AVFrame to default values.
diff --git a/libavcodec/avs.c b/libavcodec/avs.c
index a53a068c15..f65a25a8e3 100644
--- a/libavcodec/avs.c
+++ b/libavcodec/avs.c
@@ -152,7 +152,7 @@ static av_cold int avs_decode_init(AVCodecContext * avctx)
 
 AVCodec avs_decoder = {
     "avs",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_AVS,
     sizeof(AvsContext),
     avs_decode_init,
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
index 6b4a5acabd..4ed48c2a1a 100644
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@@ -132,7 +132,7 @@ static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx)
 
 AVCodec bethsoftvid_decoder = {
     .name = "bethsoftvid",
-    .type = CODEC_TYPE_VIDEO,
+    .type = AVMEDIA_TYPE_VIDEO,
     .id = CODEC_ID_BETHSOFTVID,
     .priv_data_size = sizeof(BethsoftvidContext),
     .init = bethsoftvid_decode_init,
diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c
index 31b914927e..2581b377a4 100644
--- a/libavcodec/bfi.c
+++ b/libavcodec/bfi.c
@@ -173,7 +173,7 @@ static av_cold int bfi_decode_close(AVCodecContext * avctx)
 
 AVCodec bfi_decoder = {
     .name = "bfi",
-    .type = CODEC_TYPE_VIDEO,
+    .type = AVMEDIA_TYPE_VIDEO,
     .id = CODEC_ID_BFI,
     .priv_data_size = sizeof(BFIContext),
     .init = bfi_decode_init,
diff --git a/libavcodec/bink.c b/libavcodec/bink.c
index f7b17b144f..a988a34933 100644
--- a/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@ -1001,7 +1001,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec bink_decoder = {
     "binkvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_BINKVIDEO,
     sizeof(BinkContext),
     decode_init,
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index 5fbc2de6d6..ff2906077a 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -288,7 +288,7 @@ static int decode_frame(AVCodecContext *avctx,
 
 AVCodec binkaudio_rdft_decoder = {
     "binkaudio_rdft",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_BINKAUDIO_RDFT,
     sizeof(BinkAudioContext),
     decode_init,
@@ -300,7 +300,7 @@ AVCodec binkaudio_rdft_decoder = {
 
 AVCodec binkaudio_dct_decoder = {
     "binkaudio_dct",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_BINKAUDIO_DCT,
     sizeof(BinkAudioContext),
     decode_init,
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 43e7f2f91b..da7bb787d0 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -337,7 +337,7 @@ static av_cold int bmp_decode_end(AVCodecContext *avctx)
 
 AVCodec bmp_decoder = {
     "bmp",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_BMP,
     sizeof(BMPContext),
     bmp_decode_init,
diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c
index edb4dadf1f..ee85f3cfae 100644
--- a/libavcodec/bmpenc.c
+++ b/libavcodec/bmpenc.c
@@ -133,7 +133,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s
 
 AVCodec bmp_encoder = {
     "bmp",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_BMP,
     sizeof(BMPContext),
     bmp_encode_init,
diff --git a/libavcodec/c93.c b/libavcodec/c93.c
index 0e362cad98..d713ff8e26 100644
--- a/libavcodec/c93.c
+++ b/libavcodec/c93.c
@@ -244,7 +244,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
 
 AVCodec c93_decoder = {
     "c93",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_C93,
     sizeof(C93DecoderContext),
     decode_init,
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index 5929c8e2fb..b4ae451ed6 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -711,7 +711,7 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size,
 
 AVCodec cavs_decoder = {
     "cavs",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_CAVS,
     sizeof(AVSContext),
     ff_cavs_init,
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c
index 8f04e01297..5ad6e51c1c 100644
--- a/libavcodec/cdgraphics.c
+++ b/libavcodec/cdgraphics.c
@@ -369,7 +369,7 @@ static av_cold int cdg_decode_end(AVCodecContext *avctx)
 
 AVCodec cdgraphics_decoder = {
     "cdgraphics",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_CDGRAPHICS,
     sizeof(CDGraphicsContext),
     cdg_decode_init,
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 45ca1a93e3..90c2a6410d 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -457,7 +457,7 @@ static av_cold int cinepak_decode_end(AVCodecContext *avctx)
 
 AVCodec cinepak_decoder = {
     "cinepak",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_CINEPAK,
     sizeof(CinepakContext),
     cinepak_decode_init,
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 2164bf20f4..b7c3443675 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -137,7 +137,7 @@ static av_cold int encode_init(AVCodecContext *avctx){
 
 AVCodec cljr_decoder = {
     "cljr",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_CLJR,
     sizeof(CLJRContext),
     decode_init,
@@ -151,7 +151,7 @@ AVCodec cljr_decoder = {
 #if CONFIG_CLJR_ENCODER
 AVCodec cljr_encoder = {
     "cljr",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_CLJR,
     sizeof(CLJRContext),
     encode_init,
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 4948acfb89..f7efe9e60c 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1288,7 +1288,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
 AVCodec cook_decoder =
 {
     .name = "cook",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_COOK,
     .priv_data_size = sizeof(COOKContext),
     .init = cook_decode_init,
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c
index 45edca382c..e4f4b8f825 100644
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@@ -249,7 +249,7 @@ static av_cold int decode_end(AVCodecContext *avctx) {
 
 AVCodec cscd_decoder = {
     "camstudio",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_CSCD,
     sizeof(CamStudioContext),
     decode_init,
diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c
index c947165478..cfc7000897 100644
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@@ -180,7 +180,7 @@ static av_cold int cyuv_decode_end(AVCodecContext *avctx)
 #if CONFIG_AURA_DECODER
 AVCodec aura_decoder = {
     "aura",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_AURA,
     sizeof(CyuvDecodeContext),
     cyuv_decode_init,
@@ -196,7 +196,7 @@ AVCodec aura_decoder = {
 #if CONFIG_CYUV_DECODER
 AVCodec cyuv_decoder = {
     "cyuv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_CYUV,
     sizeof(CyuvDecodeContext),
     cyuv_decode_init,
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index dfa8945e3d..18074cf404 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1330,7 +1330,7 @@ static av_cold int dca_decode_end(AVCodecContext * avctx)
 
 AVCodec dca_decoder = {
     .name = "dca",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_DTS,
     .priv_data_size = sizeof(DCAContext),
     .init = dca_decode_init,
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index f78cb0d7db..8b7c343d09 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -346,7 +346,7 @@ static av_cold int dnxhd_decode_close(AVCodecContext *avctx)
 
 AVCodec dnxhd_decoder = {
     "dnxhd",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DNXHD,
     sizeof(DNXHDContext),
     dnxhd_decode_init,
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 5c986452e3..6b089299e9 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -850,7 +850,7 @@ static int dnxhd_encode_end(AVCodecContext *avctx)
 
 AVCodec dnxhd_encoder = {
     "dnxhd",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DNXHD,
     sizeof(DNXHDEncContext),
     dnxhd_encode_init,
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c
index 69c7002ad7..7c5351686e 100644
--- a/libavcodec/dpcm.c
+++ b/libavcodec/dpcm.c
@@ -301,7 +301,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
 #define DPCM_DECODER(id, name, long_name_)      \
 AVCodec name ## _decoder = {                    \
     #name,                                      \
-    CODEC_TYPE_AUDIO,                           \
+    AVMEDIA_TYPE_AUDIO,                         \
     id,                                         \
     sizeof(DPCMContext),                        \
     dpcm_decode_init,                           \
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index ec0f435610..94a91816c5 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -216,7 +216,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec dpx_decoder = {
     "dpx",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DPX,
     sizeof(DPXContext),
     decode_init,
diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index 6e5ff12446..03ea3c9e54 100644
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -345,7 +345,7 @@ static int cinaudio_decode_frame(AVCodecContext *avctx,
 
 AVCodec dsicinvideo_decoder = {
     "dsicinvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DSICINVIDEO,
     sizeof(CinVideoContext),
     cinvideo_decode_init,
@@ -358,7 +358,7 @@ AVCodec dsicinvideo_decoder = {
 
 AVCodec dsicinaudio_decoder = {
     "dsicinaudio",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_DSICINAUDIO,
     sizeof(CinAudioContext),
     cinaudio_decode_init,
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index e3b1064a95..182fe29d38 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -1282,7 +1282,7 @@ static int dvvideo_close(AVCodecContext *c)
 #if CONFIG_DVVIDEO_ENCODER
 AVCodec dvvideo_encoder = {
     "dvvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DVVIDEO,
     sizeof(DVVideoContext),
     dvvideo_init_encoder,
@@ -1295,7 +1295,7 @@ AVCodec dvvideo_encoder = {
 #if CONFIG_DVVIDEO_DECODER
 AVCodec dvvideo_decoder = {
     "dvvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DVVIDEO,
     sizeof(DVVideoContext),
     dvvideo_init,
diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c
index 3788d55933..0f098266d8 100644
--- a/libavcodec/dvbsub.c
+++ b/libavcodec/dvbsub.c
@@ -404,7 +404,7 @@ static int dvbsub_encode(AVCodecContext *avctx,
 
 AVCodec dvbsub_encoder = {
     "dvbsub",
-    CODEC_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_SUBTITLE,
     CODEC_ID_DVB_SUBTITLE,
     sizeof(DVBSubtitleContext),
     NULL,
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index b810ef9e49..54c74b5b41 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -1413,7 +1413,7 @@ static int dvbsub_decode(AVCodecContext *avctx,
 
 AVCodec dvbsub_decoder = {
     "dvbsub",
-    CODEC_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_SUBTITLE,
     CODEC_ID_DVB_SUBTITLE,
     sizeof(DVBSubContext),
     dvbsub_init_decoder,
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 142241217c..75b52566d3 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -488,7 +488,7 @@ static int dvdsub_decode(AVCodecContext *avctx,
 
 AVCodec dvdsub_decoder = {
     "dvdsub",
-    CODEC_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_SUBTITLE,
     CODEC_ID_DVD_SUBTITLE,
     0,
     NULL,
diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 4dc58e7bde..4ee0f37c9d 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -217,7 +217,7 @@ static int dvdsub_encode(AVCodecContext *avctx,
 
 AVCodec dvdsub_encoder = {
     "dvdsub",
-    CODEC_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_SUBTITLE,
     CODEC_ID_DVD_SUBTITLE,
     0,
     NULL,
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index c06ab85cc7..97420c13e8 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -319,7 +319,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec dxa_decoder = {
     "dxa",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DXA,
     sizeof(DxaDecContext),
     decode_init,
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 9262bb8957..22c76df601 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -425,7 +425,7 @@ static int end_frame(AVCodecContext *avctx)
 
 AVHWAccel h264_dxva2_hwaccel = {
     .name           = "h264_dxva2",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_H264,
     .pix_fmt        = PIX_FMT_DXVA2_VLD,
     .capabilities   = 0,
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c
index 95a55849be..a11121347a 100644
--- a/libavcodec/dxva2_vc1.c
+++ b/libavcodec/dxva2_vc1.c
@@ -266,7 +266,7 @@ static int end_frame(AVCodecContext *avctx)
 #if CONFIG_WMV3_DXVA2_HWACCEL
 AVHWAccel wmv3_dxva2_hwaccel = {
     .name           = "wmv3_dxva2",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_WMV3,
     .pix_fmt        = PIX_FMT_DXVA2_VLD,
     .capabilities   = 0,
@@ -279,7 +279,7 @@ AVHWAccel wmv3_dxva2_hwaccel = {
 
 AVHWAccel vc1_dxva2_hwaccel = {
     .name           = "vc1_dxva2",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_VC1,
     .pix_fmt        = PIX_FMT_DXVA2_VLD,
     .capabilities   = 0,
diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index 30eaf3cfd2..a39705de87 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -205,7 +205,7 @@ static av_cold int cmv_decode_end(AVCodecContext *avctx){
 
 AVCodec eacmv_decoder = {
     "eacmv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_CMV,
     sizeof(CmvContext),
     cmv_decode_init,
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index 2e9fa8b452..91f5ec0c6f 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -307,7 +307,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec eamad_decoder = {
     "eamad",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MAD,
     sizeof(MadContext),
     decode_init,
diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c
index e5c39912c7..1a28e09d2d 100644
--- a/libavcodec/eatgq.c
+++ b/libavcodec/eatgq.c
@@ -245,7 +245,7 @@ static av_cold int tgq_decode_end(AVCodecContext *avctx){
 
 AVCodec eatgq_decoder = {
     "eatgq",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TGQ,
     sizeof(TgqContext),
     tgq_decode_init,
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index 5eb31b7fc8..ce0be4bae7 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -335,7 +335,7 @@ static av_cold int tgv_decode_end(AVCodecContext *avctx)
 
 AVCodec eatgv_decoder = {
     "eatgv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TGV,
     sizeof(TgvContext),
     tgv_decode_init,
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index e917be9fe8..bedfaadc15 100644
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -156,7 +156,7 @@ static av_cold int tqi_decode_end(AVCodecContext *avctx)
 
 AVCodec eatqi_decoder = {
     "eatqi",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TQI,
     sizeof(TqiContext),
     tqi_decode_init,
diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c
index 80b1484b75..b51206a0b5 100644
--- a/libavcodec/escape124.c
+++ b/libavcodec/escape124.c
@@ -374,7 +374,7 @@ static int escape124_decode_frame(AVCodecContext *avctx,
 
 AVCodec escape124_decoder = {
     "escape124",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ESCAPE124,
     sizeof(Escape124Context),
     escape124_decode_init,
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index e3b71f7bb1..5566b0a7cd 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1125,7 +1125,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
 
 AVCodec ffv1_decoder = {
     "ffv1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FFV1,
     sizeof(FFV1Context),
     decode_init,
@@ -1140,7 +1140,7 @@ AVCodec ffv1_decoder = {
 #if CONFIG_FFV1_ENCODER
 AVCodec ffv1_encoder = {
     "ffv1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FFV1,
     sizeof(FFV1Context),
     encode_init,
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 0ebc23d6cf..89b09e8720 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -799,7 +799,7 @@ static void flac_flush(AVCodecContext *avctx)
 
 AVCodec flac_decoder = {
     "flac",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_FLAC,
     sizeof(FLACContext),
     flac_decode_init,
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index c1f862a684..33d8133a37 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1253,7 +1253,7 @@ static av_cold int flac_encode_close(AVCodecContext *avctx)
 
 AVCodec flac_encoder = {
     "flac",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_FLAC,
     sizeof(FlacEncodeContext),
     flac_encode_init,
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index b2bdffe7c9..9d581c7099 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -252,7 +252,7 @@ static av_cold int flashsv_decode_end(AVCodecContext *avctx)
 
 AVCodec flashsv_decoder = {
     "flashsv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FLASHSV,
     sizeof(FlashSVContext),
     flashsv_decode_init,
diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c
index 4d2b47979f..852b344396 100644
--- a/libavcodec/flashsvenc.c
+++ b/libavcodec/flashsvenc.c
@@ -282,7 +282,7 @@ static av_cold int flashsv_encode_end(AVCodecContext *avctx)
 
 AVCodec flashsv_encoder = {
     "flashsv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FLASHSV,
     sizeof(FlashSVContext),
     flashsv_encode_init,
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 2ee7837f60..e2bb0e90ec 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -739,7 +739,7 @@ static av_cold int flic_decode_end(AVCodecContext *avctx)
 
 AVCodec flic_decoder = {
     "flic",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FLIC,
     sizeof(FlicDecodeContext),
     flic_decode_init,
diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c
index 50f7b25191..cf9661ce1c 100644
--- a/libavcodec/flvdec.c
+++ b/libavcodec/flvdec.c
@@ -119,7 +119,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
 
 AVCodec flv_decoder = {
     "flv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FLV1,
     sizeof(MpegEncContext),
     ff_h263_decode_init,
diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c
index 80dd46b60d..bf320f2ffe 100644
--- a/libavcodec/flvenc.c
+++ b/libavcodec/flvenc.c
@@ -86,7 +86,7 @@ void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, in
 
 AVCodec flv_encoder = {
     "flv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FLV1,
     sizeof(MpegEncContext),
     MPV_encode_init,
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index da1bf0dd72..4e85f6106a 100644
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -366,7 +366,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec fraps_decoder = {
     "fraps",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FRAPS,
     sizeof(FrapsContext),
     decode_init,
diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c
index 28ed612df0..b685248b5f 100644
--- a/libavcodec/frwu.c
+++ b/libavcodec/frwu.c
@@ -111,7 +111,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
 
 AVCodec frwu_decoder = {
     "FRWU",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FRWU,
     0,
     decode_init,
diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index a4b2099832..5e0051171b 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -387,7 +387,7 @@ static int g726_decode_frame(AVCodecContext *avctx,
 #if CONFIG_ADPCM_G726_ENCODER
 AVCodec adpcm_g726_encoder = {
     "g726",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ADPCM_G726,
     sizeof(G726Context),
     g726_init,
@@ -401,7 +401,7 @@ AVCodec adpcm_g726_encoder = {
 
 AVCodec adpcm_g726_decoder = {
     "g726",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ADPCM_G726,
     sizeof(G726Context),
     g726_init,
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index be243606cf..3a6fb0fb7a 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -315,7 +315,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 AVCodec g729_decoder =
 {
     "g729",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_G729,
     sizeof(G729Context),
     decoder_init,
diff --git a/libavcodec/gif.c b/libavcodec/gif.c
index 8c7f72ba80..c04f8bbc1d 100644
--- a/libavcodec/gif.c
+++ b/libavcodec/gif.c
@@ -168,7 +168,7 @@ static int gif_encode_close(AVCodecContext *avctx)
 
 AVCodec gif_encoder = {
     "gif",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_GIF,
     sizeof(GIFContext),
     gif_encode_init,
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c
index 70da4e2a57..1daf1b7b1a 100644
--- a/libavcodec/gifdec.c
+++ b/libavcodec/gifdec.c
@@ -328,7 +328,7 @@ static av_cold int gif_decode_close(AVCodecContext *avctx)
 
 AVCodec gif_decoder = {
     "gif",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_GIF,
     sizeof(GifState),
     gif_decode_init,
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index ab266a0f6c..328e959637 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -643,7 +643,7 @@ static av_cold int h261_decode_end(AVCodecContext *avctx)
 
 AVCodec h261_decoder = {
     "h261",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_H261,
     sizeof(H261Context),
     h261_decode_init,
diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c
index 68d60f872d..9538567999 100644
--- a/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@@ -323,7 +323,7 @@ static void h261_encode_block(H261Context * h, DCTELEM * block, int n){
 
 AVCodec h261_encoder = {
     "h261",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_H261,
     sizeof(H261Context),
     MPV_encode_init,
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index e690583010..f85f15abe3 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -727,7 +727,7 @@ av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time);
 
 AVCodec h263_decoder = {
     "h263",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_H263,
     sizeof(MpegEncContext),
     ff_h263_decode_init,
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 16ece73693..62c74a3325 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3148,7 +3148,7 @@ av_cold int ff_h264_decode_end(AVCodecContext *avctx)
 
 AVCodec h264_decoder = {
     "h264",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_H264,
     sizeof(H264Context),
     ff_h264_decode_init,
@@ -3164,7 +3164,7 @@ AVCodec h264_decoder = {
 #if CONFIG_H264_VDPAU_DECODER
 AVCodec h264_vdpau_decoder = {
     "h264_vdpau",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_H264,
     sizeof(H264Context),
     ff_h264_decode_init,
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index 3b56bb3869..1a55abbe4c 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -1414,7 +1414,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
 #if CONFIG_HUFFYUV_DECODER
 AVCodec huffyuv_decoder = {
     "huffyuv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_HUFFYUV,
     sizeof(HYuvContext),
     decode_init,
@@ -1430,7 +1430,7 @@ AVCodec huffyuv_decoder = {
 #if CONFIG_FFVHUFF_DECODER
 AVCodec ffvhuff_decoder = {
     "ffvhuff",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FFVHUFF,
     sizeof(HYuvContext),
     decode_init,
@@ -1446,7 +1446,7 @@ AVCodec ffvhuff_decoder = {
 #if CONFIG_HUFFYUV_ENCODER
 AVCodec huffyuv_encoder = {
     "huffyuv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_HUFFYUV,
     sizeof(HYuvContext),
     encode_init,
@@ -1460,7 +1460,7 @@ AVCodec huffyuv_encoder = {
 #if CONFIG_FFVHUFF_ENCODER
 AVCodec ffvhuff_encoder = {
     "ffvhuff",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_FFVHUFF,
     sizeof(HYuvContext),
     encode_init,
diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index 7ce9c42a39..7cb887c8eb 100644
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -255,7 +255,7 @@ static av_cold int idcin_decode_end(AVCodecContext *avctx)
 
 AVCodec idcin_decoder = {
     "idcinvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_IDCIN,
     sizeof(IdcinContext),
     idcin_decode_init,
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 19671d767f..a5d8c93e78 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -218,7 +218,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec iff_ilbm_decoder = {
     "iff_ilbm",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_IFF_ILBM,
     sizeof(IffContext),
     decode_init,
@@ -231,7 +231,7 @@ AVCodec iff_ilbm_decoder = {
 
 AVCodec iff_byterun1_decoder = {
     "iff_byterun1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_IFF_BYTERUN1,
     sizeof(IffContext),
     decode_init,
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index c8bf3367ac..4dd73b6a4c 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -823,7 +823,7 @@ static av_cold int imc_decode_close(AVCodecContext * avctx)
 
 AVCodec imc_decoder = {
     .name = "imc",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_IMC,
     .priv_data_size = sizeof(IMCContext),
     .init = imc_decode_init,
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index 6755014110..f210a4bf09 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -226,7 +226,7 @@ static av_cold int ir2_decode_end(AVCodecContext *avctx){
 
 AVCodec indeo2_decoder = {
     "indeo2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_INDEO2,
     sizeof(Ir2Context),
     ir2_decode_init,
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 05f79258b3..e5df32c672 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -1138,7 +1138,7 @@ static av_cold int indeo3_decode_end(AVCodecContext *avctx)
 
 AVCodec indeo3_decoder = {
     "indeo3",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_INDEO3,
     sizeof(Indeo3DecodeContext),
     indeo3_decode_init,
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 9dea301d8a..eb8961cbfa 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -817,7 +817,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
 
 AVCodec indeo5_decoder = {
     .name           = "indeo5",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_INDEO5,
     .priv_data_size = sizeof(IVI5DecContext),
     .init           = decode_init,
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index e522ed4ada..5e451294da 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -117,7 +117,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
 
 AVCodec h263i_decoder = {
     "h263i",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_H263I,
     sizeof(MpegEncContext),
     ff_h263_decode_init,
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index 8992a1de30..e1d6baf8c7 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -1095,7 +1095,7 @@ static av_cold int ipvideo_decode_end(AVCodecContext *avctx)
 
 AVCodec interplay_video_decoder = {
     "interplayvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_INTERPLAY_VIDEO,
     sizeof(IpvideoContext),
     ipvideo_decode_init,
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index bc80d13d68..0df3c4bcd8 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -365,7 +365,7 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transfor
 
 AVCodec jpegls_decoder = {
     "jpegls",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_JPEGLS,
     sizeof(MJpegDecodeContext),
     ff_mjpeg_decode_init,
diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c
index ea12ddaae4..91e0f2d496 100644
--- a/libavcodec/jpeglsenc.c
+++ b/libavcodec/jpeglsenc.c
@@ -384,7 +384,7 @@ static av_cold int encode_init_ls(AVCodecContext *ctx) {
 
 AVCodec jpegls_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them
     "jpegls",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_JPEGLS,
     sizeof(JpeglsContext),
     encode_init_ls,
diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c
index d786578a95..f07d2367ec 100644
--- a/libavcodec/kgv1dec.c
+++ b/libavcodec/kgv1dec.c
@@ -165,7 +165,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec kgv1_decoder = {
     "kgv1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_KGV1,
     sizeof(KgvContext),
     decode_init,
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c
index f4b54a138f..48c7ca44a2 100644
--- a/libavcodec/kmvc.c
+++ b/libavcodec/kmvc.c
@@ -403,7 +403,7 @@ static av_cold int decode_end(AVCodecContext * avctx)
 
 AVCodec kmvc_decoder = {
     "kmvc",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_KMVC,
     sizeof(KmvcContext),
     decode_init,
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index d4fe65cceb..b6dc266b46 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -611,7 +611,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 #if CONFIG_MSZH_DECODER
 AVCodec mszh_decoder = {
     "mszh",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MSZH,
     sizeof(LclDecContext),
     decode_init,
@@ -626,7 +626,7 @@ AVCodec mszh_decoder = {
 #if CONFIG_ZLIB_DECODER
 AVCodec zlib_decoder = {
     "zlib",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ZLIB,
     sizeof(LclDecContext),
     decode_init,
diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 4c43916fd1..abaa86891a 100644
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -180,7 +180,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
 
 AVCodec zlib_encoder = {
     "zlib",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ZLIB,
     sizeof(LclEncContext),
     encode_init,
diff --git a/libavcodec/libdiracdec.c b/libavcodec/libdiracdec.c
index b403094198..273a9501f3 100644
--- a/libavcodec/libdiracdec.c
+++ b/libavcodec/libdiracdec.c
@@ -195,7 +195,7 @@ static void libdirac_flush(AVCodecContext *avccontext)
 
 AVCodec libdirac_decoder = {
     "libdirac",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DIRAC,
     sizeof(FfmpegDiracDecoderParams),
     libdirac_decode_init,
diff --git a/libavcodec/libdiracenc.c b/libavcodec/libdiracenc.c
index 6770eb7c3f..65b088c2b3 100644
--- a/libavcodec/libdiracenc.c
+++ b/libavcodec/libdiracenc.c
@@ -393,7 +393,7 @@ static av_cold int libdirac_encode_close(AVCodecContext *avccontext)
 
 AVCodec libdirac_encoder = {
     "libdirac",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DIRAC,
     sizeof(FfmpegDiracEncoderParams),
     libdirac_encode_init,
diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c
index 18b056b04f..e8514e11b8 100644
--- a/libavcodec/libfaac.c
+++ b/libavcodec/libfaac.c
@@ -147,7 +147,7 @@ static av_cold int Faac_encode_close(AVCodecContext *avctx)
 
 AVCodec libfaac_encoder = {
     "libfaac",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AAC,
     sizeof(FaacAudioContext),
     Faac_encode_init,
diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c
index e417467d01..eff5089db2 100644
--- a/libavcodec/libfaad.c
+++ b/libavcodec/libfaad.c
@@ -322,7 +322,7 @@ static av_cold int faac_decode_init(AVCodecContext *avctx)
 
 AVCodec libfaad_decoder = {
     "libfaad",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AAC,
     sizeof(FAACContext),
     faac_decode_init,
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c
index 9dfad1392c..d8122488db 100644
--- a/libavcodec/libgsm.c
+++ b/libavcodec/libgsm.c
@@ -114,7 +114,7 @@ static int libgsm_encode_frame(AVCodecContext *avctx,
 
 AVCodec libgsm_encoder = {
     "libgsm",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_GSM,
     0,
     libgsm_init,
@@ -126,7 +126,7 @@ AVCodec libgsm_encoder = {
 
 AVCodec libgsm_ms_encoder = {
     "libgsm_ms",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_GSM_MS,
     0,
     libgsm_init,
@@ -158,7 +158,7 @@ static int libgsm_decode_frame(AVCodecContext *avctx,
 
 AVCodec libgsm_decoder = {
     "libgsm",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_GSM,
     0,
     libgsm_init,
@@ -170,7 +170,7 @@ AVCodec libgsm_decoder = {
 
 AVCodec libgsm_ms_decoder = {
     "libgsm_ms",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_GSM_MS,
     0,
     libgsm_init,
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
index 62f6c02179..31190cc5d0 100644
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@@ -216,7 +216,7 @@ static av_cold int MP3lame_encode_close(AVCodecContext *avctx)
 
 AVCodec libmp3lame_encoder = {
     "libmp3lame",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MP3,
     sizeof(Mp3AudioContext),
     MP3lame_encode_init,
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index 8aee7c5817..266164514f 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -141,7 +141,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
 
 AVCodec libopencore_amrnb_decoder = {
     "libopencore_amrnb",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AMR_NB,
     sizeof(AMRContext),
     amr_nb_decode_init,
@@ -215,7 +215,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
 
 AVCodec libopencore_amrnb_encoder = {
     "libopencore_amrnb",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AMR_NB,
     sizeof(AMRContext),
     amr_nb_encode_init,
@@ -312,7 +312,7 @@ static int amr_wb_decode_close(AVCodecContext *avctx)
 
 AVCodec libopencore_amrwb_decoder = {
     "libopencore_amrwb",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AMR_WB,
     sizeof(AMRWBContext),
     amr_wb_decode_init,
diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c
index 387ea8b5d9..86282f7163 100644
--- a/libavcodec/libopenjpeg.c
+++ b/libavcodec/libopenjpeg.c
@@ -185,7 +185,7 @@ static av_cold int libopenjpeg_decode_close(AVCodecContext *avctx)
 
 AVCodec libopenjpeg_decoder = {
     "libopenjpeg",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_JPEG2000,
     sizeof(LibOpenJPEGContext),
     libopenjpeg_decode_init,
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c
index 53ded57ba4..1e623c0ec2 100644
--- a/libavcodec/libschroedingerdec.c
+++ b/libavcodec/libschroedingerdec.c
@@ -347,7 +347,7 @@ static void libschroedinger_flush(AVCodecContext *avccontext)
 
 AVCodec libschroedinger_decoder = {
     "libschroedinger",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DIRAC,
     sizeof(FfmpegSchroDecoderParams),
     libschroedinger_decode_init,
diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c
index 44d4dcd428..d4430bf3ac 100644
--- a/libavcodec/libschroedingerenc.c
+++ b/libavcodec/libschroedingerenc.c
@@ -407,7 +407,7 @@ static int libschroedinger_encode_close(AVCodecContext *avccontext)
 
 AVCodec libschroedinger_encoder = {
     "libschroedinger",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_DIRAC,
     sizeof(FfmpegSchroEncoderParams),
     libschroedinger_encode_init,
diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c
index 153e395eb0..c5cfbd5108 100644
--- a/libavcodec/libspeexdec.c
+++ b/libavcodec/libspeexdec.c
@@ -140,7 +140,7 @@ static av_cold int libspeex_decode_close(AVCodecContext *avctx)
 
 AVCodec libspeex_decoder = {
     "libspeex",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_SPEEX,
     sizeof(LibSpeexContext),
     libspeex_decode_init,
diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index ac015ff200..0ae03bfb1c 100644
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -361,7 +361,7 @@ static av_cold int encode_close(AVCodecContext* avc_context)
 /*! AVCodec struct exposed to libavcodec */
 AVCodec libtheora_encoder = {
     .name = "libtheora",
-    .type = CODEC_TYPE_VIDEO,
+    .type = AVMEDIA_TYPE_VIDEO,
     .id = CODEC_ID_THEORA,
     .priv_data_size = sizeof(TheoraContext),
     .init = encode_init,
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index 530db5c14c..afa6c04693 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -217,7 +217,7 @@ static av_cold int oggvorbis_encode_close(AVCodecContext *avccontext) {
 
 AVCodec libvorbis_encoder = {
     "libvorbis",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_VORBIS,
     sizeof(OggVorbisContext),
     oggvorbis_encode_init,
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index a5f0a533d7..1ad270f84f 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -317,7 +317,7 @@ static av_cold int X264_init(AVCodecContext *avctx)
 
 AVCodec libx264_encoder = {
     .name           = "libx264",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_H264,
     .priv_data_size = sizeof(X264Context),
     .init           = X264_init,
diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c
index 855aba1ec5..3624770087 100644
--- a/libavcodec/libxvidff.c
+++ b/libavcodec/libxvidff.c
@@ -769,7 +769,7 @@ int xvid_ff_2pass(void *ref, int cmd, void *p1, void *p2) {
  */
 AVCodec libxvid_encoder = {
     "libxvid",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG4,
     sizeof(struct xvid_context),
     xvid_encode_init,
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c
index 566723dbc0..d529352b07 100644
--- a/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@@ -188,7 +188,7 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in
 
 AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them
     "ljpeg",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_LJPEG,
     sizeof(MpegEncContext),
     MPV_encode_init,
diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index 57fba82cf0..988cd0ec63 100644
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -287,7 +287,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
 
 AVCodec loco_decoder = {
     "loco",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_LOCO,
     sizeof(LOCOContext),
     decode_init,
diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index ae7b4dc833..95473345df 100644
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@@ -281,7 +281,7 @@ static int mace_decode_frame(AVCodecContext *avctx,
 
 AVCodec mace3_decoder = {
     "mace3",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MACE3,
     sizeof(MACEContext),
     mace_decode_init,
@@ -293,7 +293,7 @@ AVCodec mace3_decoder = {
 
 AVCodec mace6_decoder = {
     "mace6",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MACE6,
     sizeof(MACEContext),
     mace_decode_init,
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index 8e737715c1..33408a6f00 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -250,7 +250,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
 
 AVCodec mdec_decoder = {
     "mdec",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MDEC,
     sizeof(MDECContext),
     decode_init,
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 8cac02fe71..e5f7123e94 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -380,7 +380,7 @@ static av_cold int mimic_decode_end(AVCodecContext *avctx)
 
 AVCodec mimic_decoder = {
     "mimic",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MIMIC,
     sizeof(MimicContext),
     mimic_decode_init,
diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c
index 185e7bb55c..3bea47e3c9 100644
--- a/libavcodec/mjpegbdec.c
+++ b/libavcodec/mjpegbdec.c
@@ -147,7 +147,7 @@ read_header:
 
 AVCodec mjpegb_decoder = {
     "mjpegb",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MJPEGB,
     sizeof(MJpegDecodeContext),
     ff_mjpeg_decode_init,
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 14bd24e128..9b930e5bfd 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1533,7 +1533,7 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx)
 
 AVCodec mjpeg_decoder = {
     "mjpeg",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MJPEG,
     sizeof(MJpegDecodeContext),
     ff_mjpeg_decode_init,
@@ -1547,7 +1547,7 @@ AVCodec mjpeg_decoder = {
 
 AVCodec thp_decoder = {
     "thp",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_THP,
     sizeof(MJpegDecodeContext),
     ff_mjpeg_decode_init,
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 129a257d70..635fa1206f 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -445,7 +445,7 @@ void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64])
 
 AVCodec mjpeg_encoder = {
     "mjpeg",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MJPEG,
     sizeof(MpegEncContext),
     MPV_encode_init,
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index aa3b9cd2cd..88e6cdf5bd 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -1136,7 +1136,7 @@ error:
 
 AVCodec mlp_decoder = {
     "mlp",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MLP,
     sizeof(MLPDecodeContext),
     mlp_decode_init,
@@ -1149,7 +1149,7 @@ AVCodec mlp_decoder = {
 #if CONFIG_TRUEHD_DECODER
 AVCodec truehd_decoder = {
     "truehd",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_TRUEHD,
     sizeof(MLPDecodeContext),
     mlp_decode_init,
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index fe1156159b..6d9aaacbe6 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -200,7 +200,7 @@ static av_cold int mm_decode_end(AVCodecContext *avctx)
 
 AVCodec mmvideo_decoder = {
     "mmvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MMVIDEO,
     sizeof(MmContext),
     mm_decode_init,
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index ac9c6ecf81..9bc5e2035d 100644
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -304,7 +304,7 @@ static av_cold int mp_decode_end(AVCodecContext *avctx)
 
 AVCodec motionpixels_decoder = {
     "motionpixels",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MOTIONPIXELS,
     sizeof(MotionPixelsContext),
     mp_decode_init,
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index f6eb12cdb4..5eadbc6162 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -290,7 +290,7 @@ static void mpc7_decode_flush(AVCodecContext *avctx)
 
 AVCodec mpc7_decoder = {
     "mpc7",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MUSEPACK7,
     sizeof(MPCContext),
     mpc7_decode_init,
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index 379528e9bd..780f0b7066 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -401,7 +401,7 @@ static int mpc8_decode_frame(AVCodecContext * avctx,
 
 AVCodec mpc8_decoder = {
     "mpc8",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MUSEPACK8,
     sizeof(MPCContext),
     mpc8_decode_init,
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 1cd9acc771..bcc7fcfe78 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2502,7 +2502,7 @@ static int mpeg_decode_end(AVCodecContext *avctx)
 
 AVCodec mpeg1video_decoder = {
     "mpeg1video",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG1VIDEO,
     sizeof(Mpeg1Context),
     mpeg_decode_init,
@@ -2516,7 +2516,7 @@ AVCodec mpeg1video_decoder = {
 
 AVCodec mpeg2video_decoder = {
     "mpeg2video",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG2VIDEO,
     sizeof(Mpeg1Context),
     mpeg_decode_init,
@@ -2531,7 +2531,7 @@ AVCodec mpeg2video_decoder = {
 //legacy decoder
 AVCodec mpegvideo_decoder = {
     "mpegvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG2VIDEO,
     sizeof(Mpeg1Context),
     mpeg_decode_init,
@@ -2562,7 +2562,7 @@ static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx){
 
 AVCodec mpeg_xvmc_decoder = {
     "mpegvideo_xvmc",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG2VIDEO_XVMC,
     sizeof(Mpeg1Context),
     mpeg_mc_decode_init,
@@ -2579,7 +2579,7 @@ AVCodec mpeg_xvmc_decoder = {
 #if CONFIG_MPEG_VDPAU_DECODER
 AVCodec mpeg_vdpau_decoder = {
     "mpegvideo_vdpau",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG2VIDEO,
     sizeof(Mpeg1Context),
     mpeg_decode_init,
@@ -2595,7 +2595,7 @@ AVCodec mpeg_vdpau_decoder = {
 #if CONFIG_MPEG1_VDPAU_DECODER
 AVCodec mpeg1_vdpau_decoder = {
     "mpeg1video_vdpau",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG1VIDEO,
     sizeof(Mpeg1Context),
     mpeg_decode_init,
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 350fa4016b..9cb4ef29d0 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -932,7 +932,7 @@ static void mpeg1_encode_block(MpegEncContext *s,
 
 AVCodec mpeg1video_encoder = {
     "mpeg1video",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG1VIDEO,
     sizeof(MpegEncContext),
     encode_init,
@@ -946,7 +946,7 @@ AVCodec mpeg1video_encoder = {
 
 AVCodec mpeg2video_encoder = {
     "mpeg2video",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG2VIDEO,
     sizeof(MpegEncContext),
     encode_init,
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index baf7809d00..fa69c9ef87 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2236,7 +2236,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 
 AVCodec mpeg4_decoder = {
     "mpeg4",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG4,
     sizeof(MpegEncContext),
     decode_init,
@@ -2253,7 +2253,7 @@ AVCodec mpeg4_decoder = {
 #if CONFIG_MPEG4_VDPAU_DECODER
 AVCodec mpeg4_vdpau_decoder = {
     "mpeg4_vdpau",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG4,
     sizeof(MpegEncContext),
     decode_init,
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index 28d026b332..79190f0a6f 100644
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -1340,7 +1340,7 @@ void ff_mpeg4_encode_video_packet_header(MpegEncContext *s)
 
 AVCodec mpeg4_encoder = {
     "mpeg4",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MPEG4,
     sizeof(MpegEncContext),
     encode_init,
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index f301ce9d88..af518aab9b 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2485,7 +2485,7 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
 AVCodec mp1_decoder =
 {
     "mp1",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MP1,
     sizeof(MPADecodeContext),
     decode_init,
@@ -2501,7 +2501,7 @@ AVCodec mp1_decoder =
 AVCodec mp2_decoder =
 {
     "mp2",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MP2,
     sizeof(MPADecodeContext),
     decode_init,
@@ -2517,7 +2517,7 @@ AVCodec mp2_decoder =
 AVCodec mp3_decoder =
 {
     "mp3",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MP3,
     sizeof(MPADecodeContext),
     decode_init,
@@ -2533,7 +2533,7 @@ AVCodec mp3_decoder =
 AVCodec mp3adu_decoder =
 {
     "mp3adu",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MP3ADU,
     sizeof(MPADecodeContext),
     decode_init,
@@ -2549,7 +2549,7 @@ AVCodec mp3adu_decoder =
 AVCodec mp3on4_decoder =
 {
     "mp3on4",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MP3ON4,
     sizeof(MP3On4DecodeContext),
     decode_init_mp3on4,
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c
index a1e2023ba1..222db5357b 100644
--- a/libavcodec/mpegaudioenc.c
+++ b/libavcodec/mpegaudioenc.c
@@ -790,7 +790,7 @@ static av_cold int MPA_encode_close(AVCodecContext *avctx)
 
 AVCodec mp2_encoder = {
     "mp2",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MP2,
     sizeof(MpegAudioContext),
     MPA_encode_init,
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 8b28062e9e..ec1cbc5db8 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -3771,7 +3771,7 @@ int dct_quantize_c(MpegEncContext *s,
 
 AVCodec h263_encoder = {
     "h263",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_H263,
     sizeof(MpegEncContext),
     MPV_encode_init,
@@ -3783,7 +3783,7 @@ AVCodec h263_encoder = {
 
 AVCodec h263p_encoder = {
     "h263p",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_H263P,
     sizeof(MpegEncContext),
     MPV_encode_init,
@@ -3795,7 +3795,7 @@ AVCodec h263p_encoder = {
 
 AVCodec msmpeg4v1_encoder = {
     "msmpeg4v1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MSMPEG4V1,
     sizeof(MpegEncContext),
     MPV_encode_init,
@@ -3807,7 +3807,7 @@ AVCodec msmpeg4v1_encoder = {
 
 AVCodec msmpeg4v2_encoder = {
     "msmpeg4v2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MSMPEG4V2,
     sizeof(MpegEncContext),
     MPV_encode_init,
@@ -3819,7 +3819,7 @@ AVCodec msmpeg4v2_encoder = {
 
 AVCodec msmpeg4v3_encoder = {
     "msmpeg4",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MSMPEG4V3,
     sizeof(MpegEncContext),
     MPV_encode_init,
@@ -3831,7 +3831,7 @@ AVCodec msmpeg4v3_encoder = {
 
 AVCodec wmv1_encoder = {
     "wmv1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_WMV1,
     sizeof(MpegEncContext),
     MPV_encode_init,
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 60d104bdef..94127cf7b6 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -1921,7 +1921,7 @@ int ff_msmpeg4_decode_motion(MpegEncContext * s,
 
 AVCodec msmpeg4v1_decoder = {
     "msmpeg4v1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MSMPEG4V1,
     sizeof(MpegEncContext),
     ff_msmpeg4_decode_init,
@@ -1935,7 +1935,7 @@ AVCodec msmpeg4v1_decoder = {
 
 AVCodec msmpeg4v2_decoder = {
     "msmpeg4v2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MSMPEG4V2,
     sizeof(MpegEncContext),
     ff_msmpeg4_decode_init,
@@ -1949,7 +1949,7 @@ AVCodec msmpeg4v2_decoder = {
 
 AVCodec msmpeg4v3_decoder = {
     "msmpeg4",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MSMPEG4V3,
     sizeof(MpegEncContext),
     ff_msmpeg4_decode_init,
@@ -1963,7 +1963,7 @@ AVCodec msmpeg4v3_decoder = {
 
 AVCodec wmv1_decoder = {
     "wmv1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_WMV1,
     sizeof(MpegEncContext),
     ff_msmpeg4_decode_init,
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 3ab73a3957..0fa2c67a87 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -145,7 +145,7 @@ static av_cold int msrle_decode_end(AVCodecContext *avctx)
 
 AVCodec msrle_decoder = {
     "msrle",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MSRLE,
     sizeof(MsrleContext),
     msrle_decode_init,
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index a9d94f8f57..b2e98a015b 100644
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -333,7 +333,7 @@ static av_cold int msvideo1_decode_end(AVCodecContext *avctx)
 
 AVCodec msvideo1_decoder = {
     "msvideo1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MSVIDEO1,
     sizeof(Msvideo1Context),
     msvideo1_decode_init,
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index a2c67f65e0..95e8ed5878 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -200,7 +200,7 @@ static av_cold int decode_end(AVCodecContext * avctx) {
 
 AVCodec nellymoser_decoder = {
     "nellymoser",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_NELLYMOSER,
     sizeof(NellyMoserDecodeContext),
     decode_init,
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index 95ab22fa3e..3ea2763b78 100644
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -384,7 +384,7 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *frame, int buf_size, voi
 
 AVCodec nellymoser_encoder = {
     .name = "nellymoser",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_NELLYMOSER,
     .priv_data_size = sizeof(NellyMoserEncodeContext),
     .init = encode_init,
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index dfc26e4ebc..791f450913 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -274,7 +274,7 @@ static av_cold int decode_end(AVCodecContext *avctx) {
 
 AVCodec nuv_decoder = {
     "nuv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_NUV,
     sizeof(NuvContext),
     decode_init,
diff --git a/libavcodec/options.c b/libavcodec/options.c
index eae0205640..89b25483c2 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -423,18 +423,18 @@ static const AVOption options[]={
 
 static const AVClass av_codec_context_class = { "AVCodecContext", context_to_name, options };
 
-void avcodec_get_context_defaults2(AVCodecContext *s, enum CodecType codec_type){
+void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){
     int flags=0;
     memset(s, 0, sizeof(AVCodecContext));
 
     s->av_class= &av_codec_context_class;
 
     s->codec_type = codec_type;
-    if(codec_type == CODEC_TYPE_AUDIO)
+    if(codec_type == AVMEDIA_TYPE_AUDIO)
         flags= AV_OPT_FLAG_AUDIO_PARAM;
-    else if(codec_type == CODEC_TYPE_VIDEO)
+    else if(codec_type == AVMEDIA_TYPE_VIDEO)
         flags= AV_OPT_FLAG_VIDEO_PARAM;
-    else if(codec_type == CODEC_TYPE_SUBTITLE)
+    else if(codec_type == AVMEDIA_TYPE_SUBTITLE)
         flags= AV_OPT_FLAG_SUBTITLE_PARAM;
     av_opt_set_defaults2(s, flags, flags);
 
@@ -453,7 +453,7 @@ void avcodec_get_context_defaults2(AVCodecContext *s, enum CodecType codec_type)
     s->reordered_opaque= AV_NOPTS_VALUE;
 }
 
-AVCodecContext *avcodec_alloc_context2(enum CodecType codec_type){
+AVCodecContext *avcodec_alloc_context2(enum AVMediaType codec_type){
     AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));
 
     if(avctx==NULL) return NULL;
@@ -464,10 +464,10 @@ AVCodecContext *avcodec_alloc_context2(enum CodecType codec_type){
 }
 
 void avcodec_get_context_defaults(AVCodecContext *s){
-    avcodec_get_context_defaults2(s, CODEC_TYPE_UNKNOWN);
+    avcodec_get_context_defaults2(s, AVMEDIA_TYPE_UNKNOWN);
 }
 
 AVCodecContext *avcodec_alloc_context(void){
-    return avcodec_alloc_context2(CODEC_TYPE_UNKNOWN);
+    return avcodec_alloc_context2(AVMEDIA_TYPE_UNKNOWN);
 }
 
diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c
index 1239521a7a..ae0ea3a102 100644
--- a/libavcodec/pamenc.c
+++ b/libavcodec/pamenc.c
@@ -110,7 +110,7 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf,
 
 AVCodec pam_encoder = {
     "pam",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PAM,
     sizeof(PNMContext),
     ff_pnm_init,
diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c
index ec5f19bef4..20c1db92f1 100644
--- a/libavcodec/pcm-mpeg.c
+++ b/libavcodec/pcm-mpeg.c
@@ -297,7 +297,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx,
 
 AVCodec pcm_bluray_decoder = {
     "pcm_bluray",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_PCM_BLURAY,
     0,
     NULL,
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 572ee947e5..1298121fac 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -516,7 +516,7 @@ static int pcm_decode_frame(AVCodecContext *avctx,
 #define PCM_ENCODER(id,sample_fmt_,name,long_name_) \
 AVCodec name ## _encoder = {                    \
     #name,                                      \
-    CODEC_TYPE_AUDIO,                           \
+    AVMEDIA_TYPE_AUDIO,                         \
     id,                                         \
     0,                                          \
     pcm_encode_init,                            \
@@ -534,7 +534,7 @@ AVCodec name ## _encoder = {                    \
 #define PCM_DECODER(id,sample_fmt_,name,long_name_)         \
 AVCodec name ## _decoder = {                    \
     #name,                                      \
-    CODEC_TYPE_AUDIO,                           \
+    AVMEDIA_TYPE_AUDIO,                         \
     id,                                         \
     sizeof(PCMDecode),                          \
     pcm_decode_init,                            \
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index bbca8bce7a..2174184bce 100644
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -244,7 +244,7 @@ static av_cold int pcx_end(AVCodecContext *avctx) {
 
 AVCodec pcx_decoder = {
     "pcx",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PCX,
     sizeof(PCXContext),
     pcx_init,
diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c
index 17fa3c2f47..43ebc8720a 100644
--- a/libavcodec/pcxenc.c
+++ b/libavcodec/pcxenc.c
@@ -191,7 +191,7 @@ static int pcx_encode_frame(AVCodecContext *avctx,
 
 AVCodec pcx_encoder = {
     "pcx",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PCX,
     sizeof(PCXContext),
     pcx_encode_init,
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index 5041d3a3d9..85db88ebac 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -454,7 +454,7 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size,
 
 AVCodec pgssub_decoder = {
     "pgssub",
-    CODEC_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_SUBTITLE,
     CODEC_ID_HDMV_PGS_SUBTITLE,
     sizeof(PGSSubContext),
     init_decoder,
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 6cce626fd3..382ba524cc 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -656,7 +656,7 @@ static av_cold int png_dec_end(AVCodecContext *avctx)
 
 AVCodec png_decoder = {
     "png",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PNG,
     sizeof(PNGDecContext),
     png_dec_init,
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index 4638095e11..615bcc44cc 100644
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -438,7 +438,7 @@ static av_cold int png_enc_init(AVCodecContext *avctx){
 
 AVCodec png_encoder = {
     "png",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PNG,
     sizeof(PNGEncContext),
     png_enc_init,
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
index 5630e7689c..66033c1f4e 100644
--- a/libavcodec/pnmdec.c
+++ b/libavcodec/pnmdec.c
@@ -190,7 +190,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
 #if CONFIG_PGM_DECODER
 AVCodec pgm_decoder = {
     "pgm",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PGM,
     sizeof(PNMContext),
     ff_pnm_init,
@@ -206,7 +206,7 @@ AVCodec pgm_decoder = {
 #if CONFIG_PGMYUV_DECODER
 AVCodec pgmyuv_decoder = {
     "pgmyuv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PGMYUV,
     sizeof(PNMContext),
     ff_pnm_init,
@@ -222,7 +222,7 @@ AVCodec pgmyuv_decoder = {
 #if CONFIG_PPM_DECODER
 AVCodec ppm_decoder = {
     "ppm",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PPM,
     sizeof(PNMContext),
     ff_pnm_init,
@@ -238,7 +238,7 @@ AVCodec ppm_decoder = {
 #if CONFIG_PBM_DECODER
 AVCodec pbm_decoder = {
     "pbm",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PBM,
     sizeof(PNMContext),
     ff_pnm_init,
@@ -254,7 +254,7 @@ AVCodec pbm_decoder = {
 #if CONFIG_PAM_DECODER
 AVCodec pam_decoder = {
     "pam",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PAM,
     sizeof(PNMContext),
     ff_pnm_init,
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c
index b14a151937..1fbf665883 100644
--- a/libavcodec/pnmenc.c
+++ b/libavcodec/pnmenc.c
@@ -115,7 +115,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf,
 #if CONFIG_PGM_ENCODER
 AVCodec pgm_encoder = {
     "pgm",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PGM,
     sizeof(PNMContext),
     ff_pnm_init,
@@ -128,7 +128,7 @@ AVCodec pgm_encoder = {
 #if CONFIG_PGMYUV_ENCODER
 AVCodec pgmyuv_encoder = {
     "pgmyuv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PGMYUV,
     sizeof(PNMContext),
     ff_pnm_init,
@@ -141,7 +141,7 @@ AVCodec pgmyuv_encoder = {
 #if CONFIG_PPM_ENCODER
 AVCodec ppm_encoder = {
     "ppm",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PPM,
     sizeof(PNMContext),
     ff_pnm_init,
@@ -154,7 +154,7 @@ AVCodec ppm_encoder = {
 #if CONFIG_PBM_ENCODER
 AVCodec pbm_encoder = {
     "pbm",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PBM,
     sizeof(PNMContext),
     ff_pnm_init,
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c
index f5aa601cde..d8798f2e9c 100644
--- a/libavcodec/ptx.c
+++ b/libavcodec/ptx.c
@@ -107,7 +107,7 @@ static av_cold int ptx_end(AVCodecContext *avctx) {
 
 AVCodec ptx_decoder = {
     "ptx",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_PTX,
     sizeof(PTXContext),
     ptx_init,
diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c
index 285de1baa5..15481e0a91 100644
--- a/libavcodec/qcelpdec.c
+++ b/libavcodec/qcelpdec.c
@@ -813,7 +813,7 @@ erasure:
 AVCodec qcelp_decoder =
 {
     .name   = "qcelp",
-    .type   = CODEC_TYPE_AUDIO,
+    .type   = AVMEDIA_TYPE_AUDIO,
     .id     = CODEC_ID_QCELP,
     .init   = qcelp_decode_init,
     .decode = qcelp_decode_frame,
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 031bf2f3a4..33d4824e7b 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -1974,7 +1974,7 @@ static int qdm2_decode_frame(AVCodecContext *avctx,
 AVCodec qdm2_decoder =
 {
     .name = "qdm2",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_QDM2,
     .priv_data_size = sizeof(QDM2Context),
     .init = qdm2_decode_init,
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index f0c0350c23..594ef8c768 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -152,7 +152,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
 
 AVCodec qdraw_decoder = {
     "qdraw",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_QDRAW,
     sizeof(QdrawContext),
     decode_init,
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c
index 6b5d8732d9..e72afd1dd9 100644
--- a/libavcodec/qpeg.c
+++ b/libavcodec/qpeg.c
@@ -313,7 +313,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
 
 AVCodec qpeg_decoder = {
     "qpeg",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_QPEG,
     sizeof(QpegContext),
     decode_init,
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index dcb76ecfe5..dc300f00ac 100644
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -539,7 +539,7 @@ static av_cold int qtrle_decode_end(AVCodecContext *avctx)
 
 AVCodec qtrle_decoder = {
     "qtrle",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_QTRLE,
     sizeof(QtrleContext),
     qtrle_decode_init,
diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c
index 259a377ef0..7f95c7f5a4 100644
--- a/libavcodec/qtrleenc.c
+++ b/libavcodec/qtrleenc.c
@@ -322,7 +322,7 @@ static av_cold int qtrle_encode_end(AVCodecContext *avctx)
 
 AVCodec qtrle_encoder = {
     "qtrle",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_QTRLE,
     sizeof(QtrleEncContext),
     qtrle_encode_init,
diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c
index 0b100e5f7d..416f76498c 100644
--- a/libavcodec/r210dec.c
+++ b/libavcodec/r210dec.c
@@ -92,7 +92,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
 
 AVCodec r210_decoder = {
     "r210",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_R210,
     0,
     decode_init,
diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index deda412b2a..efa62c4913 100644
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -353,7 +353,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *vdata,
 AVCodec ra_144_decoder =
 {
     "real_144",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_RA_144,
     sizeof(RA144Context),
     ra144_decode_init,
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index abc7df51bd..c74b5f78df 100644
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -206,7 +206,7 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data,
 AVCodec ra_288_decoder =
 {
     "real_288",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_RA_288,
     sizeof(RA288Context),
     ra288_decode_init,
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index b4c7b3c6d8..b2a3c99e87 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -185,7 +185,7 @@ static av_cold int raw_close_decoder(AVCodecContext *avctx)
 
 AVCodec rawvideo_decoder = {
     "rawvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RAWVIDEO,
     sizeof(RawVideoContext),
     raw_init_decoder,
diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index b7924a97ac..8a9bb311b6 100644
--- a/libavcodec/rawenc.c
+++ b/libavcodec/rawenc.c
@@ -57,7 +57,7 @@ static int raw_encode(AVCodecContext *avctx,
 
 AVCodec rawvideo_encoder = {
     "rawvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RAWVIDEO,
     sizeof(AVFrame),
     raw_init_encoder,
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index 721e5706ac..0e582754b6 100644
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -230,7 +230,7 @@ static av_cold int rl2_decode_end(AVCodecContext *avctx)
 
 AVCodec rl2_decoder = {
     "rl2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RL2,
     sizeof(Rl2Context),
     rl2_decode_init,
diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c
index b44d5d382a..11fd6f06cb 100644
--- a/libavcodec/roqaudioenc.c
+++ b/libavcodec/roqaudioenc.c
@@ -155,7 +155,7 @@ static av_cold int roq_dpcm_encode_close(AVCodecContext *avctx)
 
 AVCodec roq_dpcm_encoder = {
     "roq_dpcm",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ROQ_DPCM,
     sizeof(ROQDPCMContext),
     roq_dpcm_encode_init,
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index 8e3bdb0dc3..a762adbc88 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -212,7 +212,7 @@ static av_cold int roq_decode_end(AVCodecContext *avctx)
 
 AVCodec roq_decoder = {
     "roqvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ROQ,
     sizeof(RoqContext),
     roq_decode_init,
diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index 8dc77bd414..0326dee368 100644
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -1057,7 +1057,7 @@ static int roq_encode_end(AVCodecContext *avctx)
 AVCodec roq_encoder =
 {
     "roqvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ROQ,
     sizeof(RoqContext),
     roq_encode_init,
diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index e24508df49..1ddb5aad62 100644
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -277,7 +277,7 @@ static av_cold int rpza_decode_end(AVCodecContext *avctx)
 
 AVCodec rpza_decoder = {
     "rpza",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RPZA,
     sizeof(RpzaContext),
     rpza_decode_init,
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 4739916475..7fb1af91d6 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -708,7 +708,7 @@ static int rv10_decode_frame(AVCodecContext *avctx,
 
 AVCodec rv10_decoder = {
     "rv10",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RV10,
     sizeof(MpegEncContext),
     rv10_decode_init,
@@ -722,7 +722,7 @@ AVCodec rv10_decoder = {
 
 AVCodec rv20_decoder = {
     "rv20",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RV20,
     sizeof(MpegEncContext),
     rv10_decode_init,
diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c
index db0e6edec4..333a108c48 100644
--- a/libavcodec/rv10enc.c
+++ b/libavcodec/rv10enc.c
@@ -58,7 +58,7 @@ void rv10_encode_picture_header(MpegEncContext *s, int picture_number)
 
 AVCodec rv10_encoder = {
     "rv10",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RV10,
     sizeof(MpegEncContext),
     MPV_encode_init,
diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c
index e25a1bc452..ac43891c39 100644
--- a/libavcodec/rv20enc.c
+++ b/libavcodec/rv20enc.c
@@ -59,7 +59,7 @@ void rv20_encode_picture_header(MpegEncContext *s, int picture_number){
 
 AVCodec rv20_encoder = {
     "rv20",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RV20,
     sizeof(MpegEncContext),
     MPV_encode_init,
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 4cb2c3d900..8bab0bba09 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -268,7 +268,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx)
 
 AVCodec rv30_decoder = {
     "rv30",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RV30,
     sizeof(RV34DecContext),
     rv30_decode_init,
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c
index baf2d6a34d..2eb030d833 100644
--- a/libavcodec/rv40.c
+++ b/libavcodec/rv40.c
@@ -668,7 +668,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx)
 
 AVCodec rv40_decoder = {
     "rv40",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RV40,
     sizeof(RV34DecContext),
     rv40_decode_init,
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c
index 2670140b28..bbfd94bdf0 100644
--- a/libavcodec/sgidec.c
+++ b/libavcodec/sgidec.c
@@ -260,7 +260,7 @@ static av_cold int sgi_end(AVCodecContext *avctx)
 
 AVCodec sgi_decoder = {
     "sgi",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SGI,
     sizeof(SgiState),
     sgi_init,
diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c
index 7c2bcae528..f9f3709788 100644
--- a/libavcodec/sgienc.c
+++ b/libavcodec/sgienc.c
@@ -161,7 +161,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
 
 AVCodec sgi_encoder = {
     "sgi",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SGI,
     sizeof(SgiContext),
     encode_init,
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 328aaccd29..0dd07dd83c 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -527,7 +527,7 @@ static void shorten_flush(AVCodecContext *avctx){
 
 AVCodec shorten_decoder = {
     "shorten",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_SHORTEN,
     sizeof(ShortenContext),
     shorten_decode_init,
diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
index d2ce9c7897..fc19ecd710 100644
--- a/libavcodec/sipr.c
+++ b/libavcodec/sipr.c
@@ -579,7 +579,7 @@ static int sipr_decode_frame(AVCodecContext *avctx, void *datap,
 
 AVCodec sipr_decoder = {
     "sipr",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_SIPR,
     sizeof(SiprContext),
     sipr_decoder_init,
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 19f0b289e5..a7134f227d 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -691,7 +691,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
 AVCodec smacker_decoder = {
     "smackvid",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SMACKVIDEO,
     sizeof(SmackVContext),
     decode_init,
@@ -704,7 +704,7 @@ AVCodec smacker_decoder = {
 
 AVCodec smackaud_decoder = {
     "smackaud",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_SMACKAUDIO,
     0,
     smka_decode_init,
diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index f63dc1e6ac..7891220c35 100644
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -473,7 +473,7 @@ static av_cold int smc_decode_end(AVCodecContext *avctx)
 
 AVCodec smc_decoder = {
     "smc",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SMC,
     sizeof(SmcContext),
     smc_decode_init,
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index ad28d6484d..5ef9e5e811 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -2237,7 +2237,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec snow_decoder = {
     "snow",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SNOW,
     sizeof(SnowContext),
     decode_init,
@@ -3988,7 +3988,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
 
 AVCodec snow_encoder = {
     "snow",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SNOW,
     sizeof(SnowContext),
     encode_init,
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index 178ae01528..570dd245d0 100644
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -937,7 +937,7 @@ static int sonic_decode_frame(AVCodecContext *avctx,
 
 AVCodec sonic_decoder = {
     "sonic",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_SONIC,
     sizeof(SonicContext),
     sonic_decode_init,
@@ -951,7 +951,7 @@ AVCodec sonic_decoder = {
 #if CONFIG_SONIC_ENCODER
 AVCodec sonic_encoder = {
     "sonic",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_SONIC,
     sizeof(SonicContext),
     sonic_encode_init,
@@ -965,7 +965,7 @@ AVCodec sonic_encoder = {
 #if CONFIG_SONIC_LS_ENCODER
 AVCodec sonic_ls_encoder = {
     "sonicls",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_SONIC_LS,
     sizeof(SonicContext),
     sonic_encode_init,
diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c
index 13cce225a2..d0b4b8cc56 100644
--- a/libavcodec/sp5xdec.c
+++ b/libavcodec/sp5xdec.c
@@ -195,7 +195,7 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
 
 AVCodec sp5x_decoder = {
     "sp5x",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SP5X,
     sizeof(MJpegDecodeContext),
     ff_mjpeg_decode_init,
@@ -209,7 +209,7 @@ AVCodec sp5x_decoder = {
 
 AVCodec amv_decoder = {
     "amv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_AMV,
     sizeof(MJpegDecodeContext),
     ff_mjpeg_decode_init,
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
index e5e0f73cb8..456ab85a88 100644
--- a/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@ -185,7 +185,7 @@ static av_cold int sunrast_end(AVCodecContext *avctx) {
 
 AVCodec sunrast_decoder = {
     "sunrast",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SUNRAST,
     sizeof(SUNRASTContext),
     sunrast_init,
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 7bc18f604e..3834afb14a 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -828,7 +828,7 @@ static av_cold int svq1_decode_end(AVCodecContext *avctx)
 
 AVCodec svq1_decoder = {
     "svq1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SVQ1,
     sizeof(MpegEncContext),
     svq1_decode_init,
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index 3432bb9c5f..03c77ffcd6 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -574,7 +574,7 @@ static av_cold int svq1_encode_end(AVCodecContext *avctx)
 
 AVCodec svq1_encoder = {
     "svq1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SVQ1,
     sizeof(SVQ1Context),
     svq1_encode_init,
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 8ece9a9b52..50de623cba 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -1071,7 +1071,7 @@ static int svq3_decode_frame(AVCodecContext *avctx,
 
 AVCodec svq3_decoder = {
     "svq3",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_SVQ3,
     sizeof(H264Context),
     svq3_decode_init,
diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index b6fe5dfed5..50fe107ea9 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -243,7 +243,7 @@ static av_cold int targa_end(AVCodecContext *avctx){
 
 AVCodec targa_decoder = {
     "targa",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TARGA,
     sizeof(TargaContext),
     targa_init,
diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c
index fa886755c1..e5d0042ecb 100644
--- a/libavcodec/targaenc.c
+++ b/libavcodec/targaenc.c
@@ -153,7 +153,7 @@ static av_cold int targa_encode_init(AVCodecContext *avctx)
 
 AVCodec targa_encoder = {
     .name = "targa",
-    .type = CODEC_TYPE_VIDEO,
+    .type = AVMEDIA_TYPE_VIDEO,
     .id = CODEC_ID_TARGA,
     .priv_data_size = sizeof(TargaContext),
     .init = targa_encode_init,
diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c
index 66055937fe..3e29c46fe2 100644
--- a/libavcodec/tiertexseqv.c
+++ b/libavcodec/tiertexseqv.c
@@ -221,7 +221,7 @@ static av_cold int seqvideo_decode_end(AVCodecContext *avctx)
 
 AVCodec tiertexseqvideo_decoder = {
     "tiertexseqvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TIERTEXSEQVIDEO,
     sizeof(SeqVideoContext),
     seqvideo_decode_init,
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index f8f3cbde95..e02767caad 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -592,7 +592,7 @@ static av_cold int tiff_end(AVCodecContext *avctx)
 
 AVCodec tiff_decoder = {
     "tiff",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TIFF,
     sizeof(TiffContext),
     tiff_init,
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 1d6b5b01f7..0cc8655b6d 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -444,7 +444,7 @@ fail:
 
 AVCodec tiff_encoder = {
     "tiff",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TIFF,
     sizeof(TiffEncoderContext),
     NULL,
diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c
index 29aaae1fe7..827d8a6183 100644
--- a/libavcodec/tmv.c
+++ b/libavcodec/tmv.c
@@ -100,7 +100,7 @@ static av_cold int tmv_decode_close(AVCodecContext *avctx)
 
 AVCodec tmv_decoder = {
     .name           = "tmv",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_TMV,
     .priv_data_size = sizeof(TMVContext),
     .close          = tmv_decode_close,
diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c
index ae08bfe0b2..2e8b72080a 100644
--- a/libavcodec/truemotion1.c
+++ b/libavcodec/truemotion1.c
@@ -892,7 +892,7 @@ static av_cold int truemotion1_decode_end(AVCodecContext *avctx)
 
 AVCodec truemotion1_decoder = {
     "truemotion1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TRUEMOTION1,
     sizeof(TrueMotion1Context),
     truemotion1_decode_init,
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index 44b89e70d1..4a5a2edf40 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -872,7 +872,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
 
 AVCodec truemotion2_decoder = {
     "truemotion2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TRUEMOTION2,
     sizeof(TM2Context),
     decode_init,
diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c
index 598d414832..da5f2636d7 100644
--- a/libavcodec/truespeech.c
+++ b/libavcodec/truespeech.c
@@ -378,7 +378,7 @@ static int truespeech_decode_frame(AVCodecContext *avctx,
 
 AVCodec truespeech_decoder = {
     "truespeech",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_TRUESPEECH,
     sizeof(TSContext),
     truespeech_decode_init,
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index bf82c6302b..d200c8aabd 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -199,7 +199,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec tscc_decoder = {
         "camtasia",
-        CODEC_TYPE_VIDEO,
+        AVMEDIA_TYPE_VIDEO,
         CODEC_ID_TSCC,
         sizeof(CamtasiaContext),
         decode_init,
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 77f9978c09..68c9840465 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -449,7 +449,7 @@ static av_cold int tta_decode_close(AVCodecContext *avctx) {
 
 AVCodec tta_decoder = {
     "tta",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_TTA,
     sizeof(TTAContext),
     tta_decode_init,
diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c
index e460ea9623..1aa66661d6 100644
--- a/libavcodec/twinvq.c
+++ b/libavcodec/twinvq.c
@@ -1119,7 +1119,7 @@ static av_cold int twin_decode_close(AVCodecContext *avctx)
 AVCodec twinvq_decoder =
 {
     "twinvq",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_TWINVQ,
     sizeof(TwinContext),
     twin_decode_init,
diff --git a/libavcodec/txd.c b/libavcodec/txd.c
index 5065d08f19..ac8229f9e4 100644
--- a/libavcodec/txd.c
+++ b/libavcodec/txd.c
@@ -156,7 +156,7 @@ static av_cold int txd_end(AVCodecContext *avctx) {
 
 AVCodec txd_decoder = {
     "txd",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TXD,
     sizeof(TXDContext),
     txd_init,
diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c
index 12dc6ac14f..f53690f4d0 100644
--- a/libavcodec/ulti.c
+++ b/libavcodec/ulti.c
@@ -406,7 +406,7 @@ static int ulti_decode_frame(AVCodecContext *avctx,
 
 AVCodec ulti_decoder = {
     "ultimotion",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ULTI,
     sizeof(UltimotionDecodeContext),
     ulti_decode_init,
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index e48cf6e4c8..0abf07ce62 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -497,7 +497,7 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
     }
 
     avctx->codec = codec;
-    if ((avctx->codec_type == CODEC_TYPE_UNKNOWN || avctx->codec_type == codec->type) &&
+    if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) &&
         avctx->codec_id == CODEC_ID_NONE) {
         avctx->codec_type = codec->type;
         avctx->codec_id   = codec->id;
@@ -775,20 +775,20 @@ static int get_bit_rate(AVCodecContext *ctx)
     int bits_per_sample;
 
     switch(ctx->codec_type) {
-    case CODEC_TYPE_VIDEO:
+    case AVMEDIA_TYPE_VIDEO:
         bit_rate = ctx->bit_rate;
         break;
-    case CODEC_TYPE_AUDIO:
+    case AVMEDIA_TYPE_AUDIO:
         bits_per_sample = av_get_bits_per_sample(ctx->codec_id);
         bit_rate = bits_per_sample ? ctx->sample_rate * ctx->channels * bits_per_sample : ctx->bit_rate;
         break;
-    case CODEC_TYPE_DATA:
+    case AVMEDIA_TYPE_DATA:
         bit_rate = ctx->bit_rate;
         break;
-    case CODEC_TYPE_SUBTITLE:
+    case AVMEDIA_TYPE_SUBTITLE:
         bit_rate = ctx->bit_rate;
         break;
-    case CODEC_TYPE_ATTACHMENT:
+    case AVMEDIA_TYPE_ATTACHMENT:
         bit_rate = ctx->bit_rate;
         break;
     default:
@@ -836,7 +836,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
     }
 
     switch(enc->codec_type) {
-    case CODEC_TYPE_VIDEO:
+    case AVMEDIA_TYPE_VIDEO:
         snprintf(buf, buf_size,
                  "Video: %s%s",
                  codec_name, enc->mb_decision ? " (hq)" : "");
@@ -871,7 +871,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
                      ", q=%d-%d", enc->qmin, enc->qmax);
         }
         break;
-    case CODEC_TYPE_AUDIO:
+    case AVMEDIA_TYPE_AUDIO:
         snprintf(buf, buf_size,
                  "Audio: %s",
                  codec_name);
@@ -886,13 +886,13 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
                      ", %s", avcodec_get_sample_fmt_name(enc->sample_fmt));
         }
         break;
-    case CODEC_TYPE_DATA:
+    case AVMEDIA_TYPE_DATA:
         snprintf(buf, buf_size, "Data: %s", codec_name);
         break;
-    case CODEC_TYPE_SUBTITLE:
+    case AVMEDIA_TYPE_SUBTITLE:
         snprintf(buf, buf_size, "Subtitle: %s", codec_name);
         break;
-    case CODEC_TYPE_ATTACHMENT:
+    case AVMEDIA_TYPE_ATTACHMENT:
         snprintf(buf, buf_size, "Attachment: %s", codec_name);
         break;
     default:
diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c
index ceeccb6346..a1a0827bed 100644
--- a/libavcodec/v210dec.c
+++ b/libavcodec/v210dec.c
@@ -122,7 +122,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
 
 AVCodec v210_decoder = {
     "v210",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_V210,
     0,
     decode_init,
diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c
index 8f20f73d45..11e0e0eb7a 100644
--- a/libavcodec/v210enc.c
+++ b/libavcodec/v210enc.c
@@ -119,7 +119,7 @@ static av_cold int encode_close(AVCodecContext *avctx)
 
 AVCodec v210_encoder = {
     "v210",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_V210,
     0,
     encode_init,
diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c
index 089aa2c127..d869d64725 100644
--- a/libavcodec/v210x.c
+++ b/libavcodec/v210x.c
@@ -134,7 +134,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
 
 AVCodec v210x_decoder = {
     "v210x",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_V210X,
     0,
     decode_init,
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index f49a54d1e2..52f836330d 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -336,7 +336,7 @@ static int decode_slice(AVCodecContext *avctx,
 
 AVHWAccel h264_vaapi_hwaccel = {
     .name           = "h264_vaapi",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_H264,
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
     .capabilities   = 0,
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index 21bc77863f..2e870dcfa0 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -140,7 +140,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
 
 AVHWAccel mpeg2_vaapi_hwaccel = {
     .name           = "mpeg2_vaapi",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_MPEG2VIDEO,
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
     .capabilities   = 0,
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index 4e606f0f1d..466ce2fd91 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -151,7 +151,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
 #if CONFIG_MPEG4_VAAPI_HWACCEL
 AVHWAccel mpeg4_vaapi_hwaccel = {
     .name           = "mpeg4_vaapi",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_MPEG4,
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
     .capabilities   = 0,
@@ -165,7 +165,7 @@ AVHWAccel mpeg4_vaapi_hwaccel = {
 #if CONFIG_H263_VAAPI_HWACCEL
 AVHWAccel h263_vaapi_hwaccel = {
     .name           = "h263_vaapi",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_H263,
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
     .capabilities   = 0,
diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
index 50a4ba266b..992e1da4b1 100644
--- a/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@ -328,7 +328,7 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,
 #if CONFIG_WMV3_VAAPI_HWACCEL
 AVHWAccel wmv3_vaapi_hwaccel = {
     .name           = "wmv3_vaapi",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_WMV3,
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
     .capabilities   = 0,
@@ -341,7 +341,7 @@ AVHWAccel wmv3_vaapi_hwaccel = {
 
 AVHWAccel vc1_vaapi_hwaccel = {
     .name           = "vc1_vaapi",
-    .type           = CODEC_TYPE_VIDEO,
+    .type           = AVMEDIA_TYPE_VIDEO,
     .id             = CODEC_ID_VC1,
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
     .capabilities   = 0,
diff --git a/libavcodec/vb.c b/libavcodec/vb.c
index 4dfac435ac..2d4d4e286d 100644
--- a/libavcodec/vb.c
+++ b/libavcodec/vb.c
@@ -289,7 +289,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec vb_decoder = {
     "vb",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VB,
     sizeof(VBDecContext),
     decode_init,
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index ebd14cb1cb..333afbd6b6 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -3319,7 +3319,7 @@ static av_cold int vc1_decode_end(AVCodecContext *avctx)
 
 AVCodec vc1_decoder = {
     "vc1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VC1,
     sizeof(VC1Context),
     vc1_decode_init,
@@ -3335,7 +3335,7 @@ AVCodec vc1_decoder = {
 #if CONFIG_WMV3_DECODER
 AVCodec wmv3_decoder = {
     "wmv3",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_WMV3,
     sizeof(VC1Context),
     vc1_decode_init,
@@ -3352,7 +3352,7 @@ AVCodec wmv3_decoder = {
 #if CONFIG_WMV3_VDPAU_DECODER
 AVCodec wmv3_vdpau_decoder = {
     "wmv3_vdpau",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_WMV3,
     sizeof(VC1Context),
     vc1_decode_init,
@@ -3369,7 +3369,7 @@ AVCodec wmv3_vdpau_decoder = {
 #if CONFIG_VC1_VDPAU_DECODER
 AVCodec vc1_vdpau_decoder = {
     "vc1_vdpau",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VC1,
     sizeof(VC1Context),
     vc1_decode_init,
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index ea2d5553a6..7800859760 100644
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -178,7 +178,7 @@ static av_cold int encode_init(AVCodecContext *avctx){
 
 AVCodec vcr1_decoder = {
     "vcr1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VCR1,
     sizeof(VCR1Context),
     decode_init,
@@ -192,7 +192,7 @@ AVCodec vcr1_decoder = {
 #if CONFIG_VCR1_ENCODER
 AVCodec vcr1_encoder = {
     "vcr1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VCR1,
     sizeof(VCR1Context),
     encode_init,
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 79318b0277..9e2d1a13c8 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -567,7 +567,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx,
 
 AVCodec vmdvideo_decoder = {
     "vmdvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VMDVIDEO,
     sizeof(VmdVideoContext),
     vmdvideo_decode_init,
@@ -580,7 +580,7 @@ AVCodec vmdvideo_decoder = {
 
 AVCodec vmdaudio_decoder = {
     "vmdaudio",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_VMDAUDIO,
     sizeof(VmdAudioContext),
     vmdaudio_decode_init,
diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index b4c07f76e4..1b30f0af10 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -510,7 +510,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec vmnc_decoder = {
     "vmnc",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VMNC,
     sizeof(VmncContext),
     decode_init,
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index ae45c1f746..0676e87efe 100644
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbis_dec.c
@@ -1645,7 +1645,7 @@ static av_cold int vorbis_decode_close(AVCodecContext *avccontext)
 
 AVCodec vorbis_decoder = {
     "vorbis",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_VORBIS,
     sizeof(vorbis_context),
     vorbis_decode_init,
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index f33f431655..862d16c878 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -1093,7 +1093,7 @@ static av_cold int vorbis_encode_close(AVCodecContext *avccontext)
 
 AVCodec vorbis_encoder = {
     "vorbis",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_VORBIS,
     sizeof(vorbis_enc_context),
     vorbis_encode_init,
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index cab3f2bd5e..2dccbcdea4 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2191,7 +2191,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
 
 AVCodec theora_decoder = {
     "theora",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_THEORA,
     sizeof(Vp3DecodeContext),
     theora_decode_init,
@@ -2206,7 +2206,7 @@ AVCodec theora_decoder = {
 
 AVCodec vp3_decoder = {
     "vp3",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VP3,
     sizeof(Vp3DecodeContext),
     vp3_decode_init,
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 1f8434c731..41e6497202 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -286,7 +286,7 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx)
 
 AVCodec vp5_decoder = {
     "vp5",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VP5,
     sizeof(VP56Context),
     vp5_decode_init,
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index b3dd80ffbf..53e2ca25ed 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -621,7 +621,7 @@ static av_cold int vp6_decode_free(AVCodecContext *avctx)
 
 AVCodec vp6_decoder = {
     "vp6",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VP6,
     sizeof(VP56Context),
     vp6_decode_init,
@@ -635,7 +635,7 @@ AVCodec vp6_decoder = {
 /* flash version, not flipped upside-down */
 AVCodec vp6f_decoder = {
     "vp6f",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VP6F,
     sizeof(VP56Context),
     vp6_decode_init,
@@ -649,7 +649,7 @@ AVCodec vp6f_decoder = {
 /* flash version, not flipped upside-down, with alpha channel */
 AVCodec vp6a_decoder = {
     "vp6a",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VP6A,
     sizeof(VP56Context),
     vp6_decode_init,
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index aba886489e..a40e4e0102 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -610,7 +610,7 @@ static av_cold int vqa_decode_end(AVCodecContext *avctx)
 
 AVCodec vqa_decoder = {
     "vqavideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_WS_VQA,
     sizeof(VqaContext),
     vqa_decode_init,
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 2c1df38b3e..d460893937 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -1020,7 +1020,7 @@ static int wavpack_decode_frame(AVCodecContext *avctx,
 
 AVCodec wavpack_decoder = {
     "wavpack",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_WAVPACK,
     sizeof(WavpackContext),
     wavpack_decode_init,
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 74583abe58..e7705470f2 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -942,7 +942,7 @@ static av_cold void flush(AVCodecContext *avctx)
 AVCodec wmav1_decoder =
 {
     "wmav1",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_WMAV1,
     sizeof(WMACodecContext),
     wma_decode_init,
@@ -956,7 +956,7 @@ AVCodec wmav1_decoder =
 AVCodec wmav2_decoder =
 {
     "wmav2",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_WMAV2,
     sizeof(WMACodecContext),
     wma_decode_init,
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index b1d4cb160d..7aaeb70baa 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -386,7 +386,7 @@ static int encode_superframe(AVCodecContext *avctx,
 AVCodec wmav1_encoder =
 {
     "wmav1",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_WMAV1,
     sizeof(WMACodecContext),
     encode_init,
@@ -399,7 +399,7 @@ AVCodec wmav1_encoder =
 AVCodec wmav2_encoder =
 {
     "wmav2",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_WMAV2,
     sizeof(WMACodecContext),
     encode_init,
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index a323a19fba..82f1b3623b 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -1565,7 +1565,7 @@ static void flush(AVCodecContext *avctx)
  */
 AVCodec wmapro_decoder = {
     "wmapro",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_WMAPRO,
     sizeof(WMAProDecodeCtx),
     decode_init,
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index 9b9609f1a2..259755343d 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -1555,7 +1555,7 @@ static av_cold void wmavoice_flush(AVCodecContext *ctx)
 
 AVCodec wmavoice_decoder = {
     "wmavoice",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_WMAVOICE,
     sizeof(WMAVoiceContext),
     wmavoice_decode_init,
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index a2eb4292a2..a9bb80cae4 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -486,7 +486,7 @@ static av_cold int wmv2_decode_end(AVCodecContext *avctx)
 
 AVCodec wmv2_decoder = {
     "wmv2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_WMV2,
     sizeof(Wmv2Context),
     wmv2_decode_init,
diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
index 84eedf3e43..7416f85233 100644
--- a/libavcodec/wmv2enc.c
+++ b/libavcodec/wmv2enc.c
@@ -213,7 +213,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
 
 AVCodec wmv2_encoder = {
     "wmv2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_WMV2,
     sizeof(Wmv2Context),
     wmv2_encode_init,
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index f537aee3af..7d325578af 100644
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -156,7 +156,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
 
 AVCodec wnv1_decoder = {
     "wnv1",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_WNV1,
     sizeof(WNV1Context),
     decode_init,
diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c
index 85e04f55d4..0e75654c1e 100644
--- a/libavcodec/ws-snd1.c
+++ b/libavcodec/ws-snd1.c
@@ -147,7 +147,7 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
 
 AVCodec ws_snd1_decoder = {
     "ws_snd1",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_WESTWOOD_SND1,
     0,
     ws_snd_decode_init,
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 2638172d3f..d75d4692a2 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -417,7 +417,7 @@ static av_cold int xan_decode_end(AVCodecContext *avctx)
 
 AVCodec xan_wc3_decoder = {
     "xan_wc3",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_XAN_WC3,
     sizeof(XanContext),
     xan_decode_init,
@@ -431,7 +431,7 @@ AVCodec xan_wc3_decoder = {
 /*
 AVCodec xan_wc4_decoder = {
     "xan_wc4",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_XAN_WC4,
     sizeof(XanContext),
     xan_decode_init,
diff --git a/libavcodec/xl.c b/libavcodec/xl.c
index 2a5110cb98..bf88938bf5 100644
--- a/libavcodec/xl.c
+++ b/libavcodec/xl.c
@@ -140,7 +140,7 @@ static av_cold int decode_end(AVCodecContext *avctx){
 
 AVCodec xl_decoder = {
     "xl",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_VIXL,
     sizeof(VideoXLContext),
     decode_init,
diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index 368caf4a6d..0055ebb20b 100644
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.c
@@ -132,7 +132,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
 AVCodec xsub_decoder = {
     "xsub",
-    CODEC_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_SUBTITLE,
     CODEC_ID_XSUB,
     0,
     decode_init,
diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c
index dbf2a2f3ab..903cbd2098 100644
--- a/libavcodec/xsubenc.c
+++ b/libavcodec/xsubenc.c
@@ -212,7 +212,7 @@ static av_cold int xsub_encoder_init(AVCodecContext *avctx)
 
 AVCodec xsub_encoder = {
     "xsub",
-    CODEC_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_SUBTITLE,
     CODEC_ID_XSUB,
     0,
     xsub_encoder_init,
diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index 235e5c9658..0c771fe05e 100644
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -249,7 +249,7 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
 AVCodec yop_decoder = {
     "yop",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_YOP,
     sizeof(YopDecContext),
     yop_decode_init,
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 35a31c0924..e8e5135731 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -654,7 +654,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
 AVCodec zmbv_decoder = {
     "zmbv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ZMBV,
     sizeof(ZmbvContext),
     decode_init,
diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c
index a04c0597ee..162b8485cb 100644
--- a/libavcodec/zmbvenc.c
+++ b/libavcodec/zmbvenc.c
@@ -325,7 +325,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
 
 AVCodec zmbv_encoder = {
     "zmbv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ZMBV,
     sizeof(ZmbvEncContext),
     encode_init,
author	Stefano Sabatini <stefano.sabatini-lala@poste.it>	2010-03-30 23:30:55 +0000
committer	Stefano Sabatini <stefano.sabatini-lala@poste.it>	2010-03-30 23:30:55 +0000
commit	72415b2adb2c25f95ceede49001bb97ed9247dbb (patch)
tree	99247889aa61bb7621c966466ea4b84c100207d3 /libavcodec
parent	ca6e7708b42e7d33ba3053bcd447d52a077bca25 (diff)
download	ffmpeg-72415b2adb2c25f95ceede49001bb97ed9247dbb.tar.gz