diff options
author | James Almer <jamrial@gmail.com> | 2015-09-07 17:45:34 +0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2015-09-07 18:46:56 +0300 |
commit | 2bef340cb2c390a17252ee020641752c5587a862 (patch) | |
tree | 75edfb19bb6e577bf9e731792d965a52c1370c67 /libavcodec/codec_desc.c | |
parent | 3e830b6dc844219673b6a036d8a3bd326ac4f9e2 (diff) |
avcodec: remove duplicate AVCodecIDs
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/codec_desc.c')
-rw-r--r-- | libavcodec/codec_desc.c | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 487bc2fd6a..4ba3aa1cea 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2806,72 +2806,6 @@ static const AVCodecDescriptor codec_descriptors[] = { }, /* deprecated codec ids */ - { - .id = AV_CODEC_ID_BRENDER_PIX_DEPRECATED, - .type = AVMEDIA_TYPE_VIDEO, - .name = "brender_pix_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image (deprecated id)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_ESCAPE130_DEPRECATED, - .type = AVMEDIA_TYPE_VIDEO, - .name = "escape130_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("Escape 130 (deprecated id)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_EXR_DEPRECATED, - .type = AVMEDIA_TYPE_VIDEO, - .name = "exr_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("OpenEXR image (deprecated id)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | - AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_G2M_DEPRECATED, - .type = AVMEDIA_TYPE_VIDEO, - .name = "g2m_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("Go2Meeting (deprecated id)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_HEVC_DEPRECATED, - .type = AVMEDIA_TYPE_VIDEO, - .name = "hevc_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding) (deprecated id)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_PAF_VIDEO_DEPRECATED, - .type = AVMEDIA_TYPE_VIDEO, - .name = "paf_video_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Video (deprecated id)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SANM_DEPRECATED, - .type = AVMEDIA_TYPE_VIDEO, - .name = "sanm_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("LucasArts SANM/SMUSH video (deprecated id)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VP7_DEPRECATED, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vp7_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("On2 VP7 (deprecated id)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WEBP_DEPRECATED, - .type = AVMEDIA_TYPE_VIDEO, - .name = "webp_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("WebP (deprecated id)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | - AV_CODEC_PROP_LOSSLESS, - }, - #if FF_API_VIMA_DECODER { .id = AV_CODEC_ID_VIMA, @@ -2881,55 +2815,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY, }, #endif - { - .id = AV_CODEC_ID_ADPCM_VIMA_DEPRECATED, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_vima_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio (deprecated id)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_OPUS_DEPRECATED, - .type = AVMEDIA_TYPE_AUDIO, - .name = "opus_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("Opus (Opus Interactive Audio Codec) (deprecated id)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_PAF_AUDIO_DEPRECATED, - .type = AVMEDIA_TYPE_AUDIO, - .name = "paf_audio_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Audio (deprecated id)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s24le_planar_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit little-endian planar (deprecated id)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s32le_planar_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit little-endian planar (deprecated id)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S16BE_PLANAR_DEPRECATED, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s16be_planar_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit big-endian planar (deprecated id)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_TAK_DEPRECATED, - .type = AVMEDIA_TYPE_AUDIO, - .name = "tak_deprecated", - .long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor) (deprecated id)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, }; const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id) |