lavc/frame_thread_encoder: Do not memcpy() from NULL.

Fixes ticket #7981.
vacing · Aug 10, 2019 · e82a619 · e82a619
1 parent 690cab3
commit e82a619
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
@@ -209,8 +209,9 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
             int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data);
             if (ret < 0)
                 goto fail;
-        } else
+        } else if (avctx->codec->priv_data_size) {
             memcpy(thread_avctx->priv_data, avctx->priv_data, avctx->codec->priv_data_size);
+        }
         thread_avctx->thread_count = 1;
         thread_avctx->active_thread_type &= ~FF_THREAD_FRAME;