diff options
author | James Almer <jamrial@gmail.com> | 2015-09-07 11:45:34 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2015-09-07 12:46:56 -0300 |
commit | 2bef340cb2c390a17252ee020641752c5587a862 (patch) | |
tree | 75edfb19bb6e577bf9e731792d965a52c1370c67 /libavcodec/utils.c | |
parent | 3e830b6dc844219673b6a036d8a3bd326ac4f9e2 (diff) | |
download | ffmpeg-2bef340cb2c390a17252ee020641752c5587a862.tar.gz |
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/utils.c')
-rw-r--r-- | libavcodec/utils.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 6888ba45db..5f3faf0e17 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2546,26 +2546,6 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) switch(id){ //This is for future deprecatec codec ids, its empty since //last major bump but will fill up again over time, please don't remove it -// case AV_CODEC_ID_UTVIDEO_DEPRECATED: return AV_CODEC_ID_UTVIDEO; - case AV_CODEC_ID_BRENDER_PIX_DEPRECATED : return AV_CODEC_ID_BRENDER_PIX; - case AV_CODEC_ID_OPUS_DEPRECATED : return AV_CODEC_ID_OPUS; - case AV_CODEC_ID_TAK_DEPRECATED : return AV_CODEC_ID_TAK; - case AV_CODEC_ID_PAF_AUDIO_DEPRECATED : return AV_CODEC_ID_PAF_AUDIO; - case AV_CODEC_ID_PCM_S16BE_PLANAR_DEPRECATED : return AV_CODEC_ID_PCM_S16BE_PLANAR; - case AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED : return AV_CODEC_ID_PCM_S24LE_PLANAR; - case AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED : return AV_CODEC_ID_PCM_S32LE_PLANAR; - case AV_CODEC_ID_ADPCM_VIMA_DEPRECATED : return AV_CODEC_ID_ADPCM_VIMA; - case AV_CODEC_ID_ESCAPE130_DEPRECATED : return AV_CODEC_ID_ESCAPE130; - case AV_CODEC_ID_EXR_DEPRECATED : return AV_CODEC_ID_EXR; - case AV_CODEC_ID_G2M_DEPRECATED : return AV_CODEC_ID_G2M; - case AV_CODEC_ID_PAF_VIDEO_DEPRECATED : return AV_CODEC_ID_PAF_VIDEO; - case AV_CODEC_ID_WEBP_DEPRECATED : return AV_CODEC_ID_WEBP; - case AV_CODEC_ID_HEVC_DEPRECATED : return AV_CODEC_ID_HEVC; - case AV_CODEC_ID_MVC1_DEPRECATED : return AV_CODEC_ID_MVC1; - case AV_CODEC_ID_MVC2_DEPRECATED : return AV_CODEC_ID_MVC2; - case AV_CODEC_ID_SANM_DEPRECATED : return AV_CODEC_ID_SANM; - case AV_CODEC_ID_SGIRLE_DEPRECATED : return AV_CODEC_ID_SGIRLE; - case AV_CODEC_ID_VP7_DEPRECATED : return AV_CODEC_ID_VP7; default : return id; } } |