Mercurial > libavcodec.hg
changeset 11560:8a4984c5cacc libavcodec
Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.
line wrap: on
line diff
--- a/4xm.c Tue Mar 30 22:09:14 2010 +0000 +++ b/4xm.c Tue Mar 30 23:30:55 2010 +0000 @@ -842,7 +842,7 @@ AVCodec fourxm_decoder = { "4xm", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_4XM, sizeof(FourXContext), decode_init,
--- a/8bps.c Tue Mar 30 22:09:14 2010 +0000 +++ b/8bps.c Tue Mar 30 23:30:55 2010 +0000 @@ -221,7 +221,7 @@ AVCodec eightbps_decoder = { "8bps", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_8BPS, sizeof(EightBpsContext), decode_init,
--- a/8svx.c Tue Mar 30 22:09:14 2010 +0000 +++ b/8svx.c Tue Mar 30 23:30:55 2010 +0000 @@ -94,7 +94,7 @@ 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_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,
--- a/aac.c Tue Mar 30 22:09:14 2010 +0000 +++ b/aac.c Tue Mar 30 23:30:55 2010 +0000 @@ -2091,7 +2091,7 @@ AVCodec aac_decoder = { "aac", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC, sizeof(AACContext), aac_decode_init,
--- a/aacenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/aacenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -629,7 +629,7 @@ AVCodec aac_encoder = { "aac", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC, sizeof(AACEncContext), aac_encode_init,
--- a/aasc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/aasc.c Tue Mar 30 23:30:55 2010 +0000 @@ -111,7 +111,7 @@ AVCodec aasc_decoder = { "aasc", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_AASC, sizeof(AascContext), aasc_decode_init,
--- a/ac3dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/ac3dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -1439,7 +1439,7 @@ 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 @@ #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,
--- a/ac3enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/ac3enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -1393,7 +1393,7 @@ AVCodec ac3_encoder = { "ac3", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3, sizeof(AC3EncodeContext), AC3_encode_init,
--- a/adpcm.c Tue Mar 30 22:09:14 2010 +0000 +++ b/adpcm.c Tue Mar 30 23:30:55 2010 +0000 @@ -1638,7 +1638,7 @@ #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 @@ #define ADPCM_DECODER(id,name,long_name_) \ AVCodec name ## _decoder = { \ #name, \ - CODEC_TYPE_AUDIO, \ + AVMEDIA_TYPE_AUDIO, \ id, \ sizeof(ADPCMContext), \ adpcm_decode_init, \
--- a/adxdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/adxdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -168,7 +168,7 @@ AVCodec adpcm_adx_decoder = { "adpcm_adx", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_ADPCM_ADX, sizeof(ADXContext), adx_decode_init,
--- a/adxenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/adxenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -185,7 +185,7 @@ AVCodec adpcm_adx_encoder = { "adpcm_adx", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_ADPCM_ADX, sizeof(ADXContext), adx_encode_init,
--- a/alac.c Tue Mar 30 22:09:14 2010 +0000 +++ b/alac.c Tue Mar 30 23:30:55 2010 +0000 @@ -701,7 +701,7 @@ AVCodec alac_decoder = { "alac", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_ALAC, sizeof(ALACContext), alac_decode_init,
--- a/alacenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/alacenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -521,7 +521,7 @@ AVCodec alac_encoder = { "alac", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_ALAC, sizeof(AlacEncodeContext), alac_encode_init,
--- a/alsdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/alsdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -1622,7 +1622,7 @@ AVCodec als_decoder = { "als", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MP4ALS, sizeof(ALSDecContext), decode_init,
--- a/amrnbdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/amrnbdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -1071,7 +1071,7 @@ 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,
--- a/anm.c Tue Mar 30 22:09:14 2010 +0000 +++ b/anm.c Tue Mar 30 23:30:55 2010 +0000 @@ -185,7 +185,7 @@ AVCodec anm_decoder = { "anm", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ANM, sizeof(AnmContext), decode_init,
--- a/apedec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/apedec.c Tue Mar 30 23:30:55 2010 +0000 @@ -879,7 +879,7 @@ AVCodec ape_decoder = { "ape", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_APE, sizeof(APEContext), ape_decode_init,
--- a/asv1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/asv1.c Tue Mar 30 23:30:55 2010 +0000 @@ -615,7 +615,7 @@ AVCodec asv1_decoder = { "asv1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ASV1, sizeof(ASV1Context), decode_init, @@ -628,7 +628,7 @@ AVCodec asv2_decoder = { "asv2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ASV2, sizeof(ASV1Context), decode_init, @@ -642,7 +642,7 @@ #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 @@ #if CONFIG_ASV2_ENCODER AVCodec asv2_encoder = { "asv2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ASV2, sizeof(ASV1Context), encode_init,
--- a/atrac1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/atrac1.c Tue Mar 30 23:30:55 2010 +0000 @@ -372,7 +372,7 @@ 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,
--- a/atrac3.c Tue Mar 30 22:09:14 2010 +0000 +++ b/atrac3.c Tue Mar 30 23:30:55 2010 +0000 @@ -1016,7 +1016,7 @@ 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,
--- a/aura.c Tue Mar 30 22:09:14 2010 +0000 +++ b/aura.c Tue Mar 30 23:30:55 2010 +0000 @@ -124,7 +124,7 @@ AVCodec aura2_decoder = { "aura2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_AURA2, sizeof(AuraDecodeContext), aura_decode_init,
--- a/avcodec.h Tue Mar 30 22:09:14 2010 +0000 +++ b/avcodec.h Tue Mar 30 23:30:55 2010 +0000 @@ -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 @@ * 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 @@ 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 @@ * 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 @@ /** * 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 @@ /** 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 @@ /** 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.
--- a/avs.c Tue Mar 30 22:09:14 2010 +0000 +++ b/avs.c Tue Mar 30 23:30:55 2010 +0000 @@ -152,7 +152,7 @@ AVCodec avs_decoder = { "avs", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_AVS, sizeof(AvsContext), avs_decode_init,
--- a/bethsoftvideo.c Tue Mar 30 22:09:14 2010 +0000 +++ b/bethsoftvideo.c Tue Mar 30 23:30:55 2010 +0000 @@ -132,7 +132,7 @@ 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,
--- a/bfi.c Tue Mar 30 22:09:14 2010 +0000 +++ b/bfi.c Tue Mar 30 23:30:55 2010 +0000 @@ -173,7 +173,7 @@ 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,
--- a/bink.c Tue Mar 30 22:09:14 2010 +0000 +++ b/bink.c Tue Mar 30 23:30:55 2010 +0000 @@ -1001,7 +1001,7 @@ AVCodec bink_decoder = { "binkvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_BINKVIDEO, sizeof(BinkContext), decode_init,
--- a/binkaudio.c Tue Mar 30 22:09:14 2010 +0000 +++ b/binkaudio.c Tue Mar 30 23:30:55 2010 +0000 @@ -288,7 +288,7 @@ 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_dct_decoder = { "binkaudio_dct", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_BINKAUDIO_DCT, sizeof(BinkAudioContext), decode_init,
--- a/bmp.c Tue Mar 30 22:09:14 2010 +0000 +++ b/bmp.c Tue Mar 30 23:30:55 2010 +0000 @@ -337,7 +337,7 @@ AVCodec bmp_decoder = { "bmp", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_BMP, sizeof(BMPContext), bmp_decode_init,
--- a/bmpenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/bmpenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -133,7 +133,7 @@ AVCodec bmp_encoder = { "bmp", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_BMP, sizeof(BMPContext), bmp_encode_init,
--- a/c93.c Tue Mar 30 22:09:14 2010 +0000 +++ b/c93.c Tue Mar 30 23:30:55 2010 +0000 @@ -244,7 +244,7 @@ AVCodec c93_decoder = { "c93", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_C93, sizeof(C93DecoderContext), decode_init,
--- a/cavsdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/cavsdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -711,7 +711,7 @@ AVCodec cavs_decoder = { "cavs", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_CAVS, sizeof(AVSContext), ff_cavs_init,
--- a/cdgraphics.c Tue Mar 30 22:09:14 2010 +0000 +++ b/cdgraphics.c Tue Mar 30 23:30:55 2010 +0000 @@ -369,7 +369,7 @@ AVCodec cdgraphics_decoder = { "cdgraphics", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_CDGRAPHICS, sizeof(CDGraphicsContext), cdg_decode_init,
--- a/cinepak.c Tue Mar 30 22:09:14 2010 +0000 +++ b/cinepak.c Tue Mar 30 23:30:55 2010 +0000 @@ -457,7 +457,7 @@ AVCodec cinepak_decoder = { "cinepak", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_CINEPAK, sizeof(CinepakContext), cinepak_decode_init,
--- a/cljr.c Tue Mar 30 22:09:14 2010 +0000 +++ b/cljr.c Tue Mar 30 23:30:55 2010 +0000 @@ -137,7 +137,7 @@ AVCodec cljr_decoder = { "cljr", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_CLJR, sizeof(CLJRContext), decode_init, @@ -151,7 +151,7 @@ #if CONFIG_CLJR_ENCODER AVCodec cljr_encoder = { "cljr", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_CLJR, sizeof(CLJRContext), encode_init,
--- a/cook.c Tue Mar 30 22:09:14 2010 +0000 +++ b/cook.c Tue Mar 30 23:30:55 2010 +0000 @@ -1288,7 +1288,7 @@ 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,
--- a/cscd.c Tue Mar 30 22:09:14 2010 +0000 +++ b/cscd.c Tue Mar 30 23:30:55 2010 +0000 @@ -249,7 +249,7 @@ AVCodec cscd_decoder = { "camstudio", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_CSCD, sizeof(CamStudioContext), decode_init,
--- a/cyuv.c Tue Mar 30 22:09:14 2010 +0000 +++ b/cyuv.c Tue Mar 30 23:30:55 2010 +0000 @@ -180,7 +180,7 @@ #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 @@ #if CONFIG_CYUV_DECODER AVCodec cyuv_decoder = { "cyuv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_CYUV, sizeof(CyuvDecodeContext), cyuv_decode_init,
--- a/dca.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dca.c Tue Mar 30 23:30:55 2010 +0000 @@ -1330,7 +1330,7 @@ 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,
--- a/dnxhddec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dnxhddec.c Tue Mar 30 23:30:55 2010 +0000 @@ -346,7 +346,7 @@ AVCodec dnxhd_decoder = { "dnxhd", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DNXHD, sizeof(DNXHDContext), dnxhd_decode_init,
--- a/dnxhdenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dnxhdenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -850,7 +850,7 @@ AVCodec dnxhd_encoder = { "dnxhd", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DNXHD, sizeof(DNXHDEncContext), dnxhd_encode_init,
--- a/dpcm.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dpcm.c Tue Mar 30 23:30:55 2010 +0000 @@ -301,7 +301,7 @@ #define DPCM_DECODER(id, name, long_name_) \ AVCodec name ## _decoder = { \ #name, \ - CODEC_TYPE_AUDIO, \ + AVMEDIA_TYPE_AUDIO, \ id, \ sizeof(DPCMContext), \ dpcm_decode_init, \
--- a/dpx.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dpx.c Tue Mar 30 23:30:55 2010 +0000 @@ -216,7 +216,7 @@ AVCodec dpx_decoder = { "dpx", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DPX, sizeof(DPXContext), decode_init,
--- a/dsicinav.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dsicinav.c Tue Mar 30 23:30:55 2010 +0000 @@ -345,7 +345,7 @@ AVCodec dsicinvideo_decoder = { "dsicinvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DSICINVIDEO, sizeof(CinVideoContext), cinvideo_decode_init, @@ -358,7 +358,7 @@ AVCodec dsicinaudio_decoder = { "dsicinaudio", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_DSICINAUDIO, sizeof(CinAudioContext), cinaudio_decode_init,
--- a/dv.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dv.c Tue Mar 30 23:30:55 2010 +0000 @@ -1282,7 +1282,7 @@ #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 @@ #if CONFIG_DVVIDEO_DECODER AVCodec dvvideo_decoder = { "dvvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DVVIDEO, sizeof(DVVideoContext), dvvideo_init,
--- a/dvbsub.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dvbsub.c Tue Mar 30 23:30:55 2010 +0000 @@ -404,7 +404,7 @@ AVCodec dvbsub_encoder = { "dvbsub", - CODEC_TYPE_SUBTITLE, + AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVB_SUBTITLE, sizeof(DVBSubtitleContext), NULL,
--- a/dvbsubdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dvbsubdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -1413,7 +1413,7 @@ AVCodec dvbsub_decoder = { "dvbsub", - CODEC_TYPE_SUBTITLE, + AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVB_SUBTITLE, sizeof(DVBSubContext), dvbsub_init_decoder,
--- a/dvdsubdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dvdsubdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -488,7 +488,7 @@ AVCodec dvdsub_decoder = { "dvdsub", - CODEC_TYPE_SUBTITLE, + AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVD_SUBTITLE, 0, NULL,
--- a/dvdsubenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dvdsubenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -217,7 +217,7 @@ AVCodec dvdsub_encoder = { "dvdsub", - CODEC_TYPE_SUBTITLE, + AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVD_SUBTITLE, 0, NULL,
--- a/dxa.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dxa.c Tue Mar 30 23:30:55 2010 +0000 @@ -319,7 +319,7 @@ AVCodec dxa_decoder = { "dxa", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DXA, sizeof(DxaDecContext), decode_init,
--- a/dxva2_h264.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dxva2_h264.c Tue Mar 30 23:30:55 2010 +0000 @@ -425,7 +425,7 @@ 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,
--- a/dxva2_vc1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/dxva2_vc1.c Tue Mar 30 23:30:55 2010 +0000 @@ -266,7 +266,7 @@ #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 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,
--- a/eacmv.c Tue Mar 30 22:09:14 2010 +0000 +++ b/eacmv.c Tue Mar 30 23:30:55 2010 +0000 @@ -205,7 +205,7 @@ AVCodec eacmv_decoder = { "eacmv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_CMV, sizeof(CmvContext), cmv_decode_init,
--- a/eamad.c Tue Mar 30 22:09:14 2010 +0000 +++ b/eamad.c Tue Mar 30 23:30:55 2010 +0000 @@ -307,7 +307,7 @@ AVCodec eamad_decoder = { "eamad", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MAD, sizeof(MadContext), decode_init,
--- a/eatgq.c Tue Mar 30 22:09:14 2010 +0000 +++ b/eatgq.c Tue Mar 30 23:30:55 2010 +0000 @@ -245,7 +245,7 @@ AVCodec eatgq_decoder = { "eatgq", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TGQ, sizeof(TgqContext), tgq_decode_init,
--- a/eatgv.c Tue Mar 30 22:09:14 2010 +0000 +++ b/eatgv.c Tue Mar 30 23:30:55 2010 +0000 @@ -335,7 +335,7 @@ AVCodec eatgv_decoder = { "eatgv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TGV, sizeof(TgvContext), tgv_decode_init,
--- a/eatqi.c Tue Mar 30 22:09:14 2010 +0000 +++ b/eatqi.c Tue Mar 30 23:30:55 2010 +0000 @@ -156,7 +156,7 @@ AVCodec eatqi_decoder = { "eatqi", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TQI, sizeof(TqiContext), tqi_decode_init,
--- a/escape124.c Tue Mar 30 22:09:14 2010 +0000 +++ b/escape124.c Tue Mar 30 23:30:55 2010 +0000 @@ -374,7 +374,7 @@ AVCodec escape124_decoder = { "escape124", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ESCAPE124, sizeof(Escape124Context), escape124_decode_init,
--- a/ffv1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/ffv1.c Tue Mar 30 23:30:55 2010 +0000 @@ -1125,7 +1125,7 @@ AVCodec ffv1_decoder = { "ffv1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FFV1, sizeof(FFV1Context), decode_init, @@ -1140,7 +1140,7 @@ #if CONFIG_FFV1_ENCODER AVCodec ffv1_encoder = { "ffv1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FFV1, sizeof(FFV1Context), encode_init,
--- a/flacdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/flacdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -799,7 +799,7 @@ AVCodec flac_decoder = { "flac", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_FLAC, sizeof(FLACContext), flac_decode_init,
--- a/flacenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/flacenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -1253,7 +1253,7 @@ AVCodec flac_encoder = { "flac", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_FLAC, sizeof(FlacEncodeContext), flac_encode_init,
--- a/flashsv.c Tue Mar 30 22:09:14 2010 +0000 +++ b/flashsv.c Tue Mar 30 23:30:55 2010 +0000 @@ -252,7 +252,7 @@ AVCodec flashsv_decoder = { "flashsv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FLASHSV, sizeof(FlashSVContext), flashsv_decode_init,
--- a/flashsvenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/flashsvenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -282,7 +282,7 @@ AVCodec flashsv_encoder = { "flashsv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FLASHSV, sizeof(FlashSVContext), flashsv_encode_init,
--- a/flicvideo.c Tue Mar 30 22:09:14 2010 +0000 +++ b/flicvideo.c Tue Mar 30 23:30:55 2010 +0000 @@ -739,7 +739,7 @@ AVCodec flic_decoder = { "flic", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FLIC, sizeof(FlicDecodeContext), flic_decode_init,
--- a/flvdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/flvdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -119,7 +119,7 @@ AVCodec flv_decoder = { "flv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FLV1, sizeof(MpegEncContext), ff_h263_decode_init,
--- a/flvenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/flvenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -86,7 +86,7 @@ AVCodec flv_encoder = { "flv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FLV1, sizeof(MpegEncContext), MPV_encode_init,
--- a/fraps.c Tue Mar 30 22:09:14 2010 +0000 +++ b/fraps.c Tue Mar 30 23:30:55 2010 +0000 @@ -366,7 +366,7 @@ AVCodec fraps_decoder = { "fraps", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FRAPS, sizeof(FrapsContext), decode_init,
--- a/frwu.c Tue Mar 30 22:09:14 2010 +0000 +++ b/frwu.c Tue Mar 30 23:30:55 2010 +0000 @@ -111,7 +111,7 @@ AVCodec frwu_decoder = { "FRWU", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FRWU, 0, decode_init,
--- a/g726.c Tue Mar 30 22:09:14 2010 +0000 +++ b/g726.c Tue Mar 30 23:30:55 2010 +0000 @@ -387,7 +387,7 @@ #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_decoder = { "g726", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_ADPCM_G726, sizeof(G726Context), g726_init,
--- a/g729dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/g729dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -315,7 +315,7 @@ AVCodec g729_decoder = { "g729", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_G729, sizeof(G729Context), decoder_init,
--- a/gif.c Tue Mar 30 22:09:14 2010 +0000 +++ b/gif.c Tue Mar 30 23:30:55 2010 +0000 @@ -168,7 +168,7 @@ AVCodec gif_encoder = { "gif", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_GIF, sizeof(GIFContext), gif_encode_init,
--- a/gifdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/gifdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -328,7 +328,7 @@ AVCodec gif_decoder = { "gif", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_GIF, sizeof(GifState), gif_decode_init,
--- a/h261dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/h261dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -643,7 +643,7 @@ AVCodec h261_decoder = { "h261", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_H261, sizeof(H261Context), h261_decode_init,
--- a/h261enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/h261enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -323,7 +323,7 @@ AVCodec h261_encoder = { "h261", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_H261, sizeof(H261Context), MPV_encode_init,
--- a/h263dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/h263dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -727,7 +727,7 @@ AVCodec h263_decoder = { "h263", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_H263, sizeof(MpegEncContext), ff_h263_decode_init,
--- a/h264.c Tue Mar 30 22:09:14 2010 +0000 +++ b/h264.c Tue Mar 30 23:30:55 2010 +0000 @@ -3148,7 +3148,7 @@ AVCodec h264_decoder = { "h264", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_H264, sizeof(H264Context), ff_h264_decode_init, @@ -3164,7 +3164,7 @@ #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,
--- a/huffyuv.c Tue Mar 30 22:09:14 2010 +0000 +++ b/huffyuv.c Tue Mar 30 23:30:55 2010 +0000 @@ -1414,7 +1414,7 @@ #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 @@ #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 @@ #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 @@ #if CONFIG_FFVHUFF_ENCODER AVCodec ffvhuff_encoder = { "ffvhuff", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FFVHUFF, sizeof(HYuvContext), encode_init,
--- a/idcinvideo.c Tue Mar 30 22:09:14 2010 +0000 +++ b/idcinvideo.c Tue Mar 30 23:30:55 2010 +0000 @@ -255,7 +255,7 @@ AVCodec idcin_decoder = { "idcinvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_IDCIN, sizeof(IdcinContext), idcin_decode_init,
--- a/iff.c Tue Mar 30 22:09:14 2010 +0000 +++ b/iff.c Tue Mar 30 23:30:55 2010 +0000 @@ -218,7 +218,7 @@ 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_byterun1_decoder = { "iff_byterun1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_IFF_BYTERUN1, sizeof(IffContext), decode_init,
--- a/imc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/imc.c Tue Mar 30 23:30:55 2010 +0000 @@ -823,7 +823,7 @@ 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,
--- a/indeo2.c Tue Mar 30 22:09:14 2010 +0000 +++ b/indeo2.c Tue Mar 30 23:30:55 2010 +0000 @@ -226,7 +226,7 @@ AVCodec indeo2_decoder = { "indeo2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_INDEO2, sizeof(Ir2Context), ir2_decode_init,
--- a/indeo3.c Tue Mar 30 22:09:14 2010 +0000 +++ b/indeo3.c Tue Mar 30 23:30:55 2010 +0000 @@ -1138,7 +1138,7 @@ AVCodec indeo3_decoder = { "indeo3", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_INDEO3, sizeof(Indeo3DecodeContext), indeo3_decode_init,
--- a/indeo5.c Tue Mar 30 22:09:14 2010 +0000 +++ b/indeo5.c Tue Mar 30 23:30:55 2010 +0000 @@ -817,7 +817,7 @@ 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,
--- a/intelh263dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/intelh263dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -117,7 +117,7 @@ AVCodec h263i_decoder = { "h263i", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_H263I, sizeof(MpegEncContext), ff_h263_decode_init,
--- a/interplayvideo.c Tue Mar 30 22:09:14 2010 +0000 +++ b/interplayvideo.c Tue Mar 30 23:30:55 2010 +0000 @@ -1095,7 +1095,7 @@ AVCodec interplay_video_decoder = { "interplayvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_INTERPLAY_VIDEO, sizeof(IpvideoContext), ipvideo_decode_init,
--- a/jpeglsdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/jpeglsdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -365,7 +365,7 @@ AVCodec jpegls_decoder = { "jpegls", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_JPEGLS, sizeof(MJpegDecodeContext), ff_mjpeg_decode_init,
--- a/jpeglsenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/jpeglsenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -384,7 +384,7 @@ 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,
--- a/kgv1dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/kgv1dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -165,7 +165,7 @@ AVCodec kgv1_decoder = { "kgv1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_KGV1, sizeof(KgvContext), decode_init,
--- a/kmvc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/kmvc.c Tue Mar 30 23:30:55 2010 +0000 @@ -403,7 +403,7 @@ AVCodec kmvc_decoder = { "kmvc", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_KMVC, sizeof(KmvcContext), decode_init,
--- a/lcldec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/lcldec.c Tue Mar 30 23:30:55 2010 +0000 @@ -611,7 +611,7 @@ #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 @@ #if CONFIG_ZLIB_DECODER AVCodec zlib_decoder = { "zlib", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ZLIB, sizeof(LclDecContext), decode_init,
--- a/lclenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/lclenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -180,7 +180,7 @@ AVCodec zlib_encoder = { "zlib", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ZLIB, sizeof(LclEncContext), encode_init,
--- a/libdiracdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libdiracdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -195,7 +195,7 @@ AVCodec libdirac_decoder = { "libdirac", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC, sizeof(FfmpegDiracDecoderParams), libdirac_decode_init,
--- a/libdiracenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libdiracenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -393,7 +393,7 @@ AVCodec libdirac_encoder = { "libdirac", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC, sizeof(FfmpegDiracEncoderParams), libdirac_encode_init,
--- a/libfaac.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libfaac.c Tue Mar 30 23:30:55 2010 +0000 @@ -147,7 +147,7 @@ AVCodec libfaac_encoder = { "libfaac", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC, sizeof(FaacAudioContext), Faac_encode_init,
--- a/libfaad.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libfaad.c Tue Mar 30 23:30:55 2010 +0000 @@ -322,7 +322,7 @@ AVCodec libfaad_decoder = { "libfaad", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC, sizeof(FAACContext), faac_decode_init,
--- a/libgsm.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libgsm.c Tue Mar 30 23:30:55 2010 +0000 @@ -114,7 +114,7 @@ AVCodec libgsm_encoder = { "libgsm", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_GSM, 0, libgsm_init, @@ -126,7 +126,7 @@ AVCodec libgsm_ms_encoder = { "libgsm_ms", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_GSM_MS, 0, libgsm_init, @@ -158,7 +158,7 @@ AVCodec libgsm_decoder = { "libgsm", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_GSM, 0, libgsm_init, @@ -170,7 +170,7 @@ AVCodec libgsm_ms_decoder = { "libgsm_ms", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_GSM_MS, 0, libgsm_init,
--- a/libmp3lame.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libmp3lame.c Tue Mar 30 23:30:55 2010 +0000 @@ -216,7 +216,7 @@ AVCodec libmp3lame_encoder = { "libmp3lame", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3, sizeof(Mp3AudioContext), MP3lame_encode_init,
--- a/libopencore-amr.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libopencore-amr.c Tue Mar 30 23:30:55 2010 +0000 @@ -141,7 +141,7 @@ 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 @@ 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 @@ AVCodec libopencore_amrwb_decoder = { "libopencore_amrwb", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_AMR_WB, sizeof(AMRWBContext), amr_wb_decode_init,
--- a/libopenjpeg.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libopenjpeg.c Tue Mar 30 23:30:55 2010 +0000 @@ -185,7 +185,7 @@ AVCodec libopenjpeg_decoder = { "libopenjpeg", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_JPEG2000, sizeof(LibOpenJPEGContext), libopenjpeg_decode_init,
--- a/libschroedingerdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libschroedingerdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -347,7 +347,7 @@ AVCodec libschroedinger_decoder = { "libschroedinger", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC, sizeof(FfmpegSchroDecoderParams), libschroedinger_decode_init,
--- a/libschroedingerenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libschroedingerenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -407,7 +407,7 @@ AVCodec libschroedinger_encoder = { "libschroedinger", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC, sizeof(FfmpegSchroEncoderParams), libschroedinger_encode_init,
--- a/libspeexdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libspeexdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -140,7 +140,7 @@ AVCodec libspeex_decoder = { "libspeex", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_SPEEX, sizeof(LibSpeexContext), libspeex_decode_init,
--- a/libtheoraenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libtheoraenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -361,7 +361,7 @@ /*! 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,
--- a/libvorbis.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libvorbis.c Tue Mar 30 23:30:55 2010 +0000 @@ -217,7 +217,7 @@ AVCodec libvorbis_encoder = { "libvorbis", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_VORBIS, sizeof(OggVorbisContext), oggvorbis_encode_init,
--- a/libx264.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libx264.c Tue Mar 30 23:30:55 2010 +0000 @@ -317,7 +317,7 @@ 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,
--- a/libxvidff.c Tue Mar 30 22:09:14 2010 +0000 +++ b/libxvidff.c Tue Mar 30 23:30:55 2010 +0000 @@ -769,7 +769,7 @@ */ AVCodec libxvid_encoder = { "libxvid", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4, sizeof(struct xvid_context), xvid_encode_init,
--- a/ljpegenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/ljpegenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -188,7 +188,7 @@ 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,
--- a/loco.c Tue Mar 30 22:09:14 2010 +0000 +++ b/loco.c Tue Mar 30 23:30:55 2010 +0000 @@ -287,7 +287,7 @@ AVCodec loco_decoder = { "loco", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_LOCO, sizeof(LOCOContext), decode_init,
--- a/mace.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mace.c Tue Mar 30 23:30:55 2010 +0000 @@ -281,7 +281,7 @@ AVCodec mace3_decoder = { "mace3", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MACE3, sizeof(MACEContext), mace_decode_init, @@ -293,7 +293,7 @@ AVCodec mace6_decoder = { "mace6", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MACE6, sizeof(MACEContext), mace_decode_init,
--- a/mdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -250,7 +250,7 @@ AVCodec mdec_decoder = { "mdec", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MDEC, sizeof(MDECContext), decode_init,
--- a/mimic.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mimic.c Tue Mar 30 23:30:55 2010 +0000 @@ -380,7 +380,7 @@ AVCodec mimic_decoder = { "mimic", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MIMIC, sizeof(MimicContext), mimic_decode_init,
--- a/mjpegbdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mjpegbdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -147,7 +147,7 @@ AVCodec mjpegb_decoder = { "mjpegb", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MJPEGB, sizeof(MJpegDecodeContext), ff_mjpeg_decode_init,
--- a/mjpegdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mjpegdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -1533,7 +1533,7 @@ AVCodec mjpeg_decoder = { "mjpeg", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MJPEG, sizeof(MJpegDecodeContext), ff_mjpeg_decode_init, @@ -1547,7 +1547,7 @@ AVCodec thp_decoder = { "thp", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_THP, sizeof(MJpegDecodeContext), ff_mjpeg_decode_init,
--- a/mjpegenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mjpegenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -445,7 +445,7 @@ AVCodec mjpeg_encoder = { "mjpeg", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MJPEG, sizeof(MpegEncContext), MPV_encode_init,
--- a/mlpdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mlpdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -1136,7 +1136,7 @@ AVCodec mlp_decoder = { "mlp", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MLP, sizeof(MLPDecodeContext), mlp_decode_init, @@ -1149,7 +1149,7 @@ #if CONFIG_TRUEHD_DECODER AVCodec truehd_decoder = { "truehd", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_TRUEHD, sizeof(MLPDecodeContext), mlp_decode_init,
--- a/mmvideo.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mmvideo.c Tue Mar 30 23:30:55 2010 +0000 @@ -200,7 +200,7 @@ AVCodec mmvideo_decoder = { "mmvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MMVIDEO, sizeof(MmContext), mm_decode_init,
--- a/motionpixels.c Tue Mar 30 22:09:14 2010 +0000 +++ b/motionpixels.c Tue Mar 30 23:30:55 2010 +0000 @@ -304,7 +304,7 @@ AVCodec motionpixels_decoder = { "motionpixels", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MOTIONPIXELS, sizeof(MotionPixelsContext), mp_decode_init,
--- a/mpc7.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mpc7.c Tue Mar 30 23:30:55 2010 +0000 @@ -290,7 +290,7 @@ AVCodec mpc7_decoder = { "mpc7", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MUSEPACK7, sizeof(MPCContext), mpc7_decode_init,
--- a/mpc8.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mpc8.c Tue Mar 30 23:30:55 2010 +0000 @@ -401,7 +401,7 @@ AVCodec mpc8_decoder = { "mpc8", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MUSEPACK8, sizeof(MPCContext), mpc8_decode_init,
--- a/mpeg12.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mpeg12.c Tue Mar 30 23:30:55 2010 +0000 @@ -2502,7 +2502,7 @@ AVCodec mpeg1video_decoder = { "mpeg1video", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG1VIDEO, sizeof(Mpeg1Context), mpeg_decode_init, @@ -2516,7 +2516,7 @@ AVCodec mpeg2video_decoder = { "mpeg2video", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO, sizeof(Mpeg1Context), mpeg_decode_init, @@ -2531,7 +2531,7 @@ //legacy decoder AVCodec mpegvideo_decoder = { "mpegvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO, sizeof(Mpeg1Context), mpeg_decode_init, @@ -2562,7 +2562,7 @@ 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 @@ #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 @@ #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,
--- a/mpeg12enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mpeg12enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -932,7 +932,7 @@ AVCodec mpeg1video_encoder = { "mpeg1video", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG1VIDEO, sizeof(MpegEncContext), encode_init, @@ -946,7 +946,7 @@ AVCodec mpeg2video_encoder = { "mpeg2video", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO, sizeof(MpegEncContext), encode_init,
--- a/mpeg4videodec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mpeg4videodec.c Tue Mar 30 23:30:55 2010 +0000 @@ -2236,7 +2236,7 @@ AVCodec mpeg4_decoder = { "mpeg4", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4, sizeof(MpegEncContext), decode_init, @@ -2253,7 +2253,7 @@ #if CONFIG_MPEG4_VDPAU_DECODER AVCodec mpeg4_vdpau_decoder = { "mpeg4_vdpau", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4, sizeof(MpegEncContext), decode_init,
--- a/mpeg4videoenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mpeg4videoenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -1340,7 +1340,7 @@ AVCodec mpeg4_encoder = { "mpeg4", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4, sizeof(MpegEncContext), encode_init,
--- a/mpegaudiodec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mpegaudiodec.c Tue Mar 30 23:30:55 2010 +0000 @@ -2485,7 +2485,7 @@ AVCodec mp1_decoder = { "mp1", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MP1, sizeof(MPADecodeContext), decode_init, @@ -2501,7 +2501,7 @@ AVCodec mp2_decoder = { "mp2", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MP2, sizeof(MPADecodeContext), decode_init, @@ -2517,7 +2517,7 @@ AVCodec mp3_decoder = { "mp3", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3, sizeof(MPADecodeContext), decode_init, @@ -2533,7 +2533,7 @@ AVCodec mp3adu_decoder = { "mp3adu", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3ADU, sizeof(MPADecodeContext), decode_init, @@ -2549,7 +2549,7 @@ AVCodec mp3on4_decoder = { "mp3on4", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3ON4, sizeof(MP3On4DecodeContext), decode_init_mp3on4,
--- a/mpegaudioenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mpegaudioenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -790,7 +790,7 @@ AVCodec mp2_encoder = { "mp2", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MP2, sizeof(MpegAudioContext), MPA_encode_init,
--- a/mpegvideo_enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/mpegvideo_enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -3771,7 +3771,7 @@ AVCodec h263_encoder = { "h263", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_H263, sizeof(MpegEncContext), MPV_encode_init, @@ -3783,7 +3783,7 @@ AVCodec h263p_encoder = { "h263p", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_H263P, sizeof(MpegEncContext), MPV_encode_init, @@ -3795,7 +3795,7 @@ AVCodec msmpeg4v1_encoder = { "msmpeg4v1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSMPEG4V1, sizeof(MpegEncContext), MPV_encode_init, @@ -3807,7 +3807,7 @@ AVCodec msmpeg4v2_encoder = { "msmpeg4v2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSMPEG4V2, sizeof(MpegEncContext), MPV_encode_init, @@ -3819,7 +3819,7 @@ AVCodec msmpeg4v3_encoder = { "msmpeg4", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSMPEG4V3, sizeof(MpegEncContext), MPV_encode_init, @@ -3831,7 +3831,7 @@ AVCodec wmv1_encoder = { "wmv1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_WMV1, sizeof(MpegEncContext), MPV_encode_init,
--- a/msmpeg4.c Tue Mar 30 22:09:14 2010 +0000 +++ b/msmpeg4.c Tue Mar 30 23:30:55 2010 +0000 @@ -1921,7 +1921,7 @@ AVCodec msmpeg4v1_decoder = { "msmpeg4v1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSMPEG4V1, sizeof(MpegEncContext), ff_msmpeg4_decode_init, @@ -1935,7 +1935,7 @@ AVCodec msmpeg4v2_decoder = { "msmpeg4v2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSMPEG4V2, sizeof(MpegEncContext), ff_msmpeg4_decode_init, @@ -1949,7 +1949,7 @@ AVCodec msmpeg4v3_decoder = { "msmpeg4", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSMPEG4V3, sizeof(MpegEncContext), ff_msmpeg4_decode_init, @@ -1963,7 +1963,7 @@ AVCodec wmv1_decoder = { "wmv1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_WMV1, sizeof(MpegEncContext), ff_msmpeg4_decode_init,
--- a/msrle.c Tue Mar 30 22:09:14 2010 +0000 +++ b/msrle.c Tue Mar 30 23:30:55 2010 +0000 @@ -145,7 +145,7 @@ AVCodec msrle_decoder = { "msrle", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSRLE, sizeof(MsrleContext), msrle_decode_init,
--- a/msvideo1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/msvideo1.c Tue Mar 30 23:30:55 2010 +0000 @@ -333,7 +333,7 @@ AVCodec msvideo1_decoder = { "msvideo1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSVIDEO1, sizeof(Msvideo1Context), msvideo1_decode_init,
--- a/nellymoserdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/nellymoserdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -200,7 +200,7 @@ AVCodec nellymoser_decoder = { "nellymoser", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_NELLYMOSER, sizeof(NellyMoserDecodeContext), decode_init,
--- a/nellymoserenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/nellymoserenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -384,7 +384,7 @@ 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,
--- a/nuv.c Tue Mar 30 22:09:14 2010 +0000 +++ b/nuv.c Tue Mar 30 23:30:55 2010 +0000 @@ -274,7 +274,7 @@ AVCodec nuv_decoder = { "nuv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_NUV, sizeof(NuvContext), decode_init,
--- a/options.c Tue Mar 30 22:09:14 2010 +0000 +++ b/options.c Tue Mar 30 23:30:55 2010 +0000 @@ -423,18 +423,18 @@ 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 @@ 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 @@ } 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); }
--- a/pamenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pamenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -110,7 +110,7 @@ AVCodec pam_encoder = { "pam", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PAM, sizeof(PNMContext), ff_pnm_init,
--- a/pcm-mpeg.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pcm-mpeg.c Tue Mar 30 23:30:55 2010 +0000 @@ -297,7 +297,7 @@ AVCodec pcm_bluray_decoder = { "pcm_bluray", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_BLURAY, 0, NULL,
--- a/pcm.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pcm.c Tue Mar 30 23:30:55 2010 +0000 @@ -516,7 +516,7 @@ #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 @@ #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, \
--- a/pcx.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pcx.c Tue Mar 30 23:30:55 2010 +0000 @@ -244,7 +244,7 @@ AVCodec pcx_decoder = { "pcx", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PCX, sizeof(PCXContext), pcx_init,
--- a/pcxenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pcxenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -191,7 +191,7 @@ AVCodec pcx_encoder = { "pcx", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PCX, sizeof(PCXContext), pcx_encode_init,
--- a/pgssubdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pgssubdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -454,7 +454,7 @@ AVCodec pgssub_decoder = { "pgssub", - CODEC_TYPE_SUBTITLE, + AVMEDIA_TYPE_SUBTITLE, CODEC_ID_HDMV_PGS_SUBTITLE, sizeof(PGSSubContext), init_decoder,
--- a/pngdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pngdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -656,7 +656,7 @@ AVCodec png_decoder = { "png", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PNG, sizeof(PNGDecContext), png_dec_init,
--- a/pngenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pngenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -438,7 +438,7 @@ AVCodec png_encoder = { "png", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PNG, sizeof(PNGEncContext), png_enc_init,
--- a/pnmdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pnmdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -190,7 +190,7 @@ #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 @@ #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 @@ #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 @@ #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 @@ #if CONFIG_PAM_DECODER AVCodec pam_decoder = { "pam", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PAM, sizeof(PNMContext), ff_pnm_init,
--- a/pnmenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/pnmenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -115,7 +115,7 @@ #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 @@ #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 @@ #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 @@ #if CONFIG_PBM_ENCODER AVCodec pbm_encoder = { "pbm", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PBM, sizeof(PNMContext), ff_pnm_init,
--- a/ptx.c Tue Mar 30 22:09:14 2010 +0000 +++ b/ptx.c Tue Mar 30 23:30:55 2010 +0000 @@ -107,7 +107,7 @@ AVCodec ptx_decoder = { "ptx", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PTX, sizeof(PTXContext), ptx_init,
--- a/qcelpdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/qcelpdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -813,7 +813,7 @@ 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,
--- a/qdm2.c Tue Mar 30 22:09:14 2010 +0000 +++ b/qdm2.c Tue Mar 30 23:30:55 2010 +0000 @@ -1974,7 +1974,7 @@ 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,
--- a/qdrw.c Tue Mar 30 22:09:14 2010 +0000 +++ b/qdrw.c Tue Mar 30 23:30:55 2010 +0000 @@ -152,7 +152,7 @@ AVCodec qdraw_decoder = { "qdraw", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_QDRAW, sizeof(QdrawContext), decode_init,
--- a/qpeg.c Tue Mar 30 22:09:14 2010 +0000 +++ b/qpeg.c Tue Mar 30 23:30:55 2010 +0000 @@ -313,7 +313,7 @@ AVCodec qpeg_decoder = { "qpeg", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_QPEG, sizeof(QpegContext), decode_init,
--- a/qtrle.c Tue Mar 30 22:09:14 2010 +0000 +++ b/qtrle.c Tue Mar 30 23:30:55 2010 +0000 @@ -539,7 +539,7 @@ AVCodec qtrle_decoder = { "qtrle", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_QTRLE, sizeof(QtrleContext), qtrle_decode_init,
--- a/qtrleenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/qtrleenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -322,7 +322,7 @@ AVCodec qtrle_encoder = { "qtrle", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_QTRLE, sizeof(QtrleEncContext), qtrle_encode_init,
--- a/r210dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/r210dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -92,7 +92,7 @@ AVCodec r210_decoder = { "r210", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_R210, 0, decode_init,
--- a/ra144.c Tue Mar 30 22:09:14 2010 +0000 +++ b/ra144.c Tue Mar 30 23:30:55 2010 +0000 @@ -353,7 +353,7 @@ AVCodec ra_144_decoder = { "real_144", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_RA_144, sizeof(RA144Context), ra144_decode_init,
--- a/ra288.c Tue Mar 30 22:09:14 2010 +0000 +++ b/ra288.c Tue Mar 30 23:30:55 2010 +0000 @@ -206,7 +206,7 @@ AVCodec ra_288_decoder = { "real_288", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_RA_288, sizeof(RA288Context), ra288_decode_init,
--- a/rawdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/rawdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -185,7 +185,7 @@ AVCodec rawvideo_decoder = { "rawvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RAWVIDEO, sizeof(RawVideoContext), raw_init_decoder,
--- a/rawenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/rawenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -57,7 +57,7 @@ AVCodec rawvideo_encoder = { "rawvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RAWVIDEO, sizeof(AVFrame), raw_init_encoder,
--- a/rl2.c Tue Mar 30 22:09:14 2010 +0000 +++ b/rl2.c Tue Mar 30 23:30:55 2010 +0000 @@ -230,7 +230,7 @@ AVCodec rl2_decoder = { "rl2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RL2, sizeof(Rl2Context), rl2_decode_init,
--- a/roqaudioenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/roqaudioenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -155,7 +155,7 @@ AVCodec roq_dpcm_encoder = { "roq_dpcm", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_ROQ_DPCM, sizeof(ROQDPCMContext), roq_dpcm_encode_init,
--- a/roqvideodec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/roqvideodec.c Tue Mar 30 23:30:55 2010 +0000 @@ -212,7 +212,7 @@ AVCodec roq_decoder = { "roqvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ROQ, sizeof(RoqContext), roq_decode_init,
--- a/roqvideoenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/roqvideoenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -1057,7 +1057,7 @@ AVCodec roq_encoder = { "roqvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ROQ, sizeof(RoqContext), roq_encode_init,
--- a/rpza.c Tue Mar 30 22:09:14 2010 +0000 +++ b/rpza.c Tue Mar 30 23:30:55 2010 +0000 @@ -277,7 +277,7 @@ AVCodec rpza_decoder = { "rpza", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RPZA, sizeof(RpzaContext), rpza_decode_init,
--- a/rv10.c Tue Mar 30 22:09:14 2010 +0000 +++ b/rv10.c Tue Mar 30 23:30:55 2010 +0000 @@ -708,7 +708,7 @@ AVCodec rv10_decoder = { "rv10", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RV10, sizeof(MpegEncContext), rv10_decode_init, @@ -722,7 +722,7 @@ AVCodec rv20_decoder = { "rv20", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RV20, sizeof(MpegEncContext), rv10_decode_init,
--- a/rv10enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/rv10enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -58,7 +58,7 @@ AVCodec rv10_encoder = { "rv10", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RV10, sizeof(MpegEncContext), MPV_encode_init,
--- a/rv20enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/rv20enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -59,7 +59,7 @@ AVCodec rv20_encoder = { "rv20", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RV20, sizeof(MpegEncContext), MPV_encode_init,
--- a/rv30.c Tue Mar 30 22:09:14 2010 +0000 +++ b/rv30.c Tue Mar 30 23:30:55 2010 +0000 @@ -268,7 +268,7 @@ AVCodec rv30_decoder = { "rv30", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RV30, sizeof(RV34DecContext), rv30_decode_init,
--- a/rv40.c Tue Mar 30 22:09:14 2010 +0000 +++ b/rv40.c Tue Mar 30 23:30:55 2010 +0000 @@ -668,7 +668,7 @@ AVCodec rv40_decoder = { "rv40", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RV40, sizeof(RV34DecContext), rv40_decode_init,
--- a/sgidec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/sgidec.c Tue Mar 30 23:30:55 2010 +0000 @@ -260,7 +260,7 @@ AVCodec sgi_decoder = { "sgi", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SGI, sizeof(SgiState), sgi_init,
--- a/sgienc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/sgienc.c Tue Mar 30 23:30:55 2010 +0000 @@ -161,7 +161,7 @@ AVCodec sgi_encoder = { "sgi", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SGI, sizeof(SgiContext), encode_init,
--- a/shorten.c Tue Mar 30 22:09:14 2010 +0000 +++ b/shorten.c Tue Mar 30 23:30:55 2010 +0000 @@ -527,7 +527,7 @@ AVCodec shorten_decoder = { "shorten", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_SHORTEN, sizeof(ShortenContext), shorten_decode_init,
--- a/sipr.c Tue Mar 30 22:09:14 2010 +0000 +++ b/sipr.c Tue Mar 30 23:30:55 2010 +0000 @@ -579,7 +579,7 @@ AVCodec sipr_decoder = { "sipr", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_SIPR, sizeof(SiprContext), sipr_decoder_init,
--- a/smacker.c Tue Mar 30 22:09:14 2010 +0000 +++ b/smacker.c Tue Mar 30 23:30:55 2010 +0000 @@ -691,7 +691,7 @@ AVCodec smacker_decoder = { "smackvid", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SMACKVIDEO, sizeof(SmackVContext), decode_init, @@ -704,7 +704,7 @@ AVCodec smackaud_decoder = { "smackaud", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_SMACKAUDIO, 0, smka_decode_init,
--- a/smc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/smc.c Tue Mar 30 23:30:55 2010 +0000 @@ -473,7 +473,7 @@ AVCodec smc_decoder = { "smc", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SMC, sizeof(SmcContext), smc_decode_init,
--- a/snow.c Tue Mar 30 22:09:14 2010 +0000 +++ b/snow.c Tue Mar 30 23:30:55 2010 +0000 @@ -2237,7 +2237,7 @@ AVCodec snow_decoder = { "snow", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SNOW, sizeof(SnowContext), decode_init, @@ -3988,7 +3988,7 @@ AVCodec snow_encoder = { "snow", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SNOW, sizeof(SnowContext), encode_init,
--- a/sonic.c Tue Mar 30 22:09:14 2010 +0000 +++ b/sonic.c Tue Mar 30 23:30:55 2010 +0000 @@ -937,7 +937,7 @@ AVCodec sonic_decoder = { "sonic", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_SONIC, sizeof(SonicContext), sonic_decode_init, @@ -951,7 +951,7 @@ #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 @@ #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,
--- a/sp5xdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/sp5xdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -195,7 +195,7 @@ AVCodec sp5x_decoder = { "sp5x", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SP5X, sizeof(MJpegDecodeContext), ff_mjpeg_decode_init, @@ -209,7 +209,7 @@ AVCodec amv_decoder = { "amv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_AMV, sizeof(MJpegDecodeContext), ff_mjpeg_decode_init,
--- a/sunrast.c Tue Mar 30 22:09:14 2010 +0000 +++ b/sunrast.c Tue Mar 30 23:30:55 2010 +0000 @@ -185,7 +185,7 @@ AVCodec sunrast_decoder = { "sunrast", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SUNRAST, sizeof(SUNRASTContext), sunrast_init,
--- a/svq1dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/svq1dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -828,7 +828,7 @@ AVCodec svq1_decoder = { "svq1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SVQ1, sizeof(MpegEncContext), svq1_decode_init,
--- a/svq1enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/svq1enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -574,7 +574,7 @@ AVCodec svq1_encoder = { "svq1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SVQ1, sizeof(SVQ1Context), svq1_encode_init,
--- a/svq3.c Tue Mar 30 22:09:14 2010 +0000 +++ b/svq3.c Tue Mar 30 23:30:55 2010 +0000 @@ -1071,7 +1071,7 @@ AVCodec svq3_decoder = { "svq3", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_SVQ3, sizeof(H264Context), svq3_decode_init,
--- a/targa.c Tue Mar 30 22:09:14 2010 +0000 +++ b/targa.c Tue Mar 30 23:30:55 2010 +0000 @@ -243,7 +243,7 @@ AVCodec targa_decoder = { "targa", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TARGA, sizeof(TargaContext), targa_init,
--- a/targaenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/targaenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -153,7 +153,7 @@ 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,
--- a/tiertexseqv.c Tue Mar 30 22:09:14 2010 +0000 +++ b/tiertexseqv.c Tue Mar 30 23:30:55 2010 +0000 @@ -221,7 +221,7 @@ AVCodec tiertexseqvideo_decoder = { "tiertexseqvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TIERTEXSEQVIDEO, sizeof(SeqVideoContext), seqvideo_decode_init,
--- a/tiff.c Tue Mar 30 22:09:14 2010 +0000 +++ b/tiff.c Tue Mar 30 23:30:55 2010 +0000 @@ -592,7 +592,7 @@ AVCodec tiff_decoder = { "tiff", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TIFF, sizeof(TiffContext), tiff_init,
--- a/tiffenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/tiffenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -444,7 +444,7 @@ AVCodec tiff_encoder = { "tiff", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TIFF, sizeof(TiffEncoderContext), NULL,
--- a/tmv.c Tue Mar 30 22:09:14 2010 +0000 +++ b/tmv.c Tue Mar 30 23:30:55 2010 +0000 @@ -100,7 +100,7 @@ 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,
--- a/truemotion1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/truemotion1.c Tue Mar 30 23:30:55 2010 +0000 @@ -892,7 +892,7 @@ AVCodec truemotion1_decoder = { "truemotion1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TRUEMOTION1, sizeof(TrueMotion1Context), truemotion1_decode_init,
--- a/truemotion2.c Tue Mar 30 22:09:14 2010 +0000 +++ b/truemotion2.c Tue Mar 30 23:30:55 2010 +0000 @@ -872,7 +872,7 @@ AVCodec truemotion2_decoder = { "truemotion2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TRUEMOTION2, sizeof(TM2Context), decode_init,
--- a/truespeech.c Tue Mar 30 22:09:14 2010 +0000 +++ b/truespeech.c Tue Mar 30 23:30:55 2010 +0000 @@ -378,7 +378,7 @@ AVCodec truespeech_decoder = { "truespeech", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_TRUESPEECH, sizeof(TSContext), truespeech_decode_init,
--- a/tscc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/tscc.c Tue Mar 30 23:30:55 2010 +0000 @@ -199,7 +199,7 @@ AVCodec tscc_decoder = { "camtasia", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TSCC, sizeof(CamtasiaContext), decode_init,
--- a/tta.c Tue Mar 30 22:09:14 2010 +0000 +++ b/tta.c Tue Mar 30 23:30:55 2010 +0000 @@ -449,7 +449,7 @@ AVCodec tta_decoder = { "tta", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_TTA, sizeof(TTAContext), tta_decode_init,
--- a/twinvq.c Tue Mar 30 22:09:14 2010 +0000 +++ b/twinvq.c Tue Mar 30 23:30:55 2010 +0000 @@ -1119,7 +1119,7 @@ AVCodec twinvq_decoder = { "twinvq", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_TWINVQ, sizeof(TwinContext), twin_decode_init,
--- a/txd.c Tue Mar 30 22:09:14 2010 +0000 +++ b/txd.c Tue Mar 30 23:30:55 2010 +0000 @@ -156,7 +156,7 @@ AVCodec txd_decoder = { "txd", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_TXD, sizeof(TXDContext), txd_init,
--- a/ulti.c Tue Mar 30 22:09:14 2010 +0000 +++ b/ulti.c Tue Mar 30 23:30:55 2010 +0000 @@ -406,7 +406,7 @@ AVCodec ulti_decoder = { "ultimotion", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_ULTI, sizeof(UltimotionDecodeContext), ulti_decode_init,
--- a/utils.c Tue Mar 30 22:09:14 2010 +0000 +++ b/utils.c Tue Mar 30 23:30:55 2010 +0000 @@ -497,7 +497,7 @@ } 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 @@ 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 @@ } 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 @@ ", 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 @@ ", %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:
--- a/v210dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/v210dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -122,7 +122,7 @@ AVCodec v210_decoder = { "v210", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_V210, 0, decode_init,
--- a/v210enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/v210enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -119,7 +119,7 @@ AVCodec v210_encoder = { "v210", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_V210, 0, encode_init,
--- a/v210x.c Tue Mar 30 22:09:14 2010 +0000 +++ b/v210x.c Tue Mar 30 23:30:55 2010 +0000 @@ -134,7 +134,7 @@ AVCodec v210x_decoder = { "v210x", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_V210X, 0, decode_init,
--- a/vaapi_h264.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vaapi_h264.c Tue Mar 30 23:30:55 2010 +0000 @@ -336,7 +336,7 @@ 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,
--- a/vaapi_mpeg2.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vaapi_mpeg2.c Tue Mar 30 23:30:55 2010 +0000 @@ -140,7 +140,7 @@ 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,
--- a/vaapi_mpeg4.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vaapi_mpeg4.c Tue Mar 30 23:30:55 2010 +0000 @@ -151,7 +151,7 @@ #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 @@ #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,
--- a/vaapi_vc1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vaapi_vc1.c Tue Mar 30 23:30:55 2010 +0000 @@ -328,7 +328,7 @@ #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 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,
--- a/vb.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vb.c Tue Mar 30 23:30:55 2010 +0000 @@ -289,7 +289,7 @@ AVCodec vb_decoder = { "vb", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VB, sizeof(VBDecContext), decode_init,
--- a/vc1dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vc1dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -3319,7 +3319,7 @@ AVCodec vc1_decoder = { "vc1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1, sizeof(VC1Context), vc1_decode_init, @@ -3335,7 +3335,7 @@ #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 @@ #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 @@ #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,
--- a/vcr1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vcr1.c Tue Mar 30 23:30:55 2010 +0000 @@ -178,7 +178,7 @@ AVCodec vcr1_decoder = { "vcr1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VCR1, sizeof(VCR1Context), decode_init, @@ -192,7 +192,7 @@ #if CONFIG_VCR1_ENCODER AVCodec vcr1_encoder = { "vcr1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VCR1, sizeof(VCR1Context), encode_init,
--- a/vmdav.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vmdav.c Tue Mar 30 23:30:55 2010 +0000 @@ -567,7 +567,7 @@ AVCodec vmdvideo_decoder = { "vmdvideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VMDVIDEO, sizeof(VmdVideoContext), vmdvideo_decode_init, @@ -580,7 +580,7 @@ AVCodec vmdaudio_decoder = { "vmdaudio", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_VMDAUDIO, sizeof(VmdAudioContext), vmdaudio_decode_init,
--- a/vmnc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vmnc.c Tue Mar 30 23:30:55 2010 +0000 @@ -510,7 +510,7 @@ AVCodec vmnc_decoder = { "vmnc", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VMNC, sizeof(VmncContext), decode_init,
--- a/vorbis_dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vorbis_dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -1645,7 +1645,7 @@ AVCodec vorbis_decoder = { "vorbis", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_VORBIS, sizeof(vorbis_context), vorbis_decode_init,
--- a/vorbis_enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vorbis_enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -1093,7 +1093,7 @@ AVCodec vorbis_encoder = { "vorbis", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_VORBIS, sizeof(vorbis_enc_context), vorbis_encode_init,
--- a/vp3.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vp3.c Tue Mar 30 23:30:55 2010 +0000 @@ -2191,7 +2191,7 @@ AVCodec theora_decoder = { "theora", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_THEORA, sizeof(Vp3DecodeContext), theora_decode_init, @@ -2206,7 +2206,7 @@ AVCodec vp3_decoder = { "vp3", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VP3, sizeof(Vp3DecodeContext), vp3_decode_init,
--- a/vp5.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vp5.c Tue Mar 30 23:30:55 2010 +0000 @@ -286,7 +286,7 @@ AVCodec vp5_decoder = { "vp5", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VP5, sizeof(VP56Context), vp5_decode_init,
--- a/vp6.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vp6.c Tue Mar 30 23:30:55 2010 +0000 @@ -621,7 +621,7 @@ AVCodec vp6_decoder = { "vp6", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VP6, sizeof(VP56Context), vp6_decode_init, @@ -635,7 +635,7 @@ /* 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 @@ /* 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,
--- a/vqavideo.c Tue Mar 30 22:09:14 2010 +0000 +++ b/vqavideo.c Tue Mar 30 23:30:55 2010 +0000 @@ -610,7 +610,7 @@ AVCodec vqa_decoder = { "vqavideo", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_WS_VQA, sizeof(VqaContext), vqa_decode_init,
--- a/wavpack.c Tue Mar 30 22:09:14 2010 +0000 +++ b/wavpack.c Tue Mar 30 23:30:55 2010 +0000 @@ -1020,7 +1020,7 @@ AVCodec wavpack_decoder = { "wavpack", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_WAVPACK, sizeof(WavpackContext), wavpack_decode_init,
--- a/wmadec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/wmadec.c Tue Mar 30 23:30:55 2010 +0000 @@ -942,7 +942,7 @@ AVCodec wmav1_decoder = { "wmav1", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_WMAV1, sizeof(WMACodecContext), wma_decode_init, @@ -956,7 +956,7 @@ AVCodec wmav2_decoder = { "wmav2", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_WMAV2, sizeof(WMACodecContext), wma_decode_init,
--- a/wmaenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/wmaenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -386,7 +386,7 @@ AVCodec wmav1_encoder = { "wmav1", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_WMAV1, sizeof(WMACodecContext), encode_init, @@ -399,7 +399,7 @@ AVCodec wmav2_encoder = { "wmav2", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_WMAV2, sizeof(WMACodecContext), encode_init,
--- a/wmaprodec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/wmaprodec.c Tue Mar 30 23:30:55 2010 +0000 @@ -1565,7 +1565,7 @@ */ AVCodec wmapro_decoder = { "wmapro", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_WMAPRO, sizeof(WMAProDecodeCtx), decode_init,
--- a/wmavoice.c Tue Mar 30 22:09:14 2010 +0000 +++ b/wmavoice.c Tue Mar 30 23:30:55 2010 +0000 @@ -1555,7 +1555,7 @@ AVCodec wmavoice_decoder = { "wmavoice", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_WMAVOICE, sizeof(WMAVoiceContext), wmavoice_decode_init,
--- a/wmv2dec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/wmv2dec.c Tue Mar 30 23:30:55 2010 +0000 @@ -486,7 +486,7 @@ AVCodec wmv2_decoder = { "wmv2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_WMV2, sizeof(Wmv2Context), wmv2_decode_init,
--- a/wmv2enc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/wmv2enc.c Tue Mar 30 23:30:55 2010 +0000 @@ -213,7 +213,7 @@ AVCodec wmv2_encoder = { "wmv2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_WMV2, sizeof(Wmv2Context), wmv2_encode_init,
--- a/wnv1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/wnv1.c Tue Mar 30 23:30:55 2010 +0000 @@ -156,7 +156,7 @@ AVCodec wnv1_decoder = { "wnv1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_WNV1, sizeof(WNV1Context), decode_init,
--- a/ws-snd1.c Tue Mar 30 22:09:14 2010 +0000 +++ b/ws-snd1.c Tue Mar 30 23:30:55 2010 +0000 @@ -147,7 +147,7 @@ AVCodec ws_snd1_decoder = { "ws_snd1", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_WESTWOOD_SND1, 0, ws_snd_decode_init,
--- a/xan.c Tue Mar 30 22:09:14 2010 +0000 +++ b/xan.c Tue Mar 30 23:30:55 2010 +0000 @@ -417,7 +417,7 @@ 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_wc4_decoder = { "xan_wc4", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_XAN_WC4, sizeof(XanContext), xan_decode_init,
--- a/xl.c Tue Mar 30 22:09:14 2010 +0000 +++ b/xl.c Tue Mar 30 23:30:55 2010 +0000 @@ -140,7 +140,7 @@ AVCodec xl_decoder = { "xl", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_VIXL, sizeof(VideoXLContext), decode_init,
--- a/xsubdec.c Tue Mar 30 22:09:14 2010 +0000 +++ b/xsubdec.c Tue Mar 30 23:30:55 2010 +0000 @@ -132,7 +132,7 @@ AVCodec xsub_decoder = { "xsub", - CODEC_TYPE_SUBTITLE, + AVMEDIA_TYPE_SUBTITLE, CODEC_ID_XSUB, 0, decode_init,
--- a/xsubenc.c Tue Mar 30 22:09:14 2010 +0000 +++ b/xsubenc.c Tue Mar 30 23:30:55 2010 +0000 @@ -212,7 +212,7 @@ AVCodec xsub_encoder = { "xsub", - CODEC_TYPE_SUBTITLE, + AVMEDIA_TYPE_SUBTITLE, CODEC_ID_XSUB, 0, xsub_encoder_init,
--- a/yop.c Tue Mar 30 22:09:14 2010 +0000 +++ b/yop.c Tue Mar 30 23:30:55 2010 +0000 @@ -249,7 +249,7 @@ AVCodec yop_decoder = { "yop", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_YOP, sizeof(YopDecContext), yop_decode_init,