RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/frame_thread_encoder: Remove redundant memcpy 

In case the underlying AVCodec has no private class, the private data
of both the main as well as each worker AVCodecContext is just zeroed
(the codec's init function has not been called on any of them and
without a private class there is no way to legitimately set anything
before the aforementioned init function).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-05-11 22:33:19 +02:00
parent 3f6e715336
commit cbf6047c83
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/frame_thread_encoder.c
View File

@ -215,8 +215,6 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx)
int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data); int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} 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->thread_count = 1;
thread_avctx->active_thread_type &= ~FF_THREAD_FRAME; thread_avctx->active_thread_type &= ~FF_THREAD_FRAME;