Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'

[ffmpeg] / libavcodec / utils.c

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 445caeff1d044144b9f9adf53e3acbf5a06fefdf..1cb914eb130348a1f00cbe46ede51522e14459e8 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2681,12 +2681,15 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id)
         case AV_CODEC_ID_PAF_AUDIO_DEPRECATED : return AV_CODEC_ID_PAF_AUDIO;
         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_SANM_DEPRECATED: return AV_CODEC_ID_SANM;
+        case AV_CODEC_ID_VP7_DEPRECATED : return AV_CODEC_ID_VP7;
         default                         : return id;
     }
 }
@@ -3433,7 +3436,8 @@ int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags)
 
 void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f)
 {
-    av_frame_unref(f->f);
+    if (f->f)
+        av_frame_unref(f->f);
 }
 
 void ff_thread_finish_setup(AVCodecContext *avctx)