Merge commit 'b97f2c7c49e35724f3963677f8aeee28089dc64e'

[ffmpeg] / libavcodec / utils.c

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b43f67540e834d45058f9d694cc6c090d1b4c27d..ada1afe337d891381734ff008709fa00d062ba70 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2682,10 +2682,12 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id)
         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_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_VP7_DEPRECATED : return AV_CODEC_ID_VP7;
         default                         : return id;
     }
 }