diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2019-07-02 11:42:32 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2019-08-11 00:03:35 +0200 |
| commit | e82a619c2a154ae6e3e3a81af55977bd5a46660e (patch) | |
| tree | 51f145538fe6e4e8189bf30c95b673fa738740c4 /libavcodec | |
| parent | 690cab32326eb76cf923a4ca5eea5cc8be3a8600 (diff) | |
lavc/frame_thread_encoder: Do not memcpy() from NULL.
Fixes ticket #7981.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/frame_thread_encoder.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 55756c4c54..949bc69f81 100644 --- 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; |