[FFmpeg-cvslog] avcodec/frame_thread_encoder: Remove redundant memcpy

Andreas Rheinhardt git at videolan.org
Tue Jun 8 16:04:50 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue May 11 22:33:19 2021 +0200| [cbf6047c83c8142dd13fabd07906a844f4165f19] | committer: Andreas Rheinhardt

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 at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cbf6047c83c8142dd13fabd07906a844f4165f19
---

 libavcodec/frame_thread_encoder.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index 5d14442c01..b3e571f4b0 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -215,8 +215,6 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx)
             int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data);
             if (ret < 0)
                 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->active_thread_type &= ~FF_THREAD_FRAME;



More information about the ffmpeg-cvslog mailing list