[FFmpeg-cvslog] avcodec/h263dec: Don't call ff_thread_finish_setup() unnecessarily
Andreas Rheinhardt
git at videolan.org
Tue Mar 4 14:35:37 EET 2025
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Feb 24 22:16:36 2025 +0100| [e4470a8e30de8af6150b4a78ea0637ca7d62b824] | committer: Andreas Rheinhardt
avcodec/h263dec: Don't call ff_thread_finish_setup() unnecessarily
All hwaccels for MPEG-4/H.263 are run serially even when frame-threading
is in use. Therefore there is no gain in calling
ff_thread_finish_setup() in this case right before outputting
the frame.
Removing this call also allows to revert commit
39a5c0ac0651113750d01f3ee6bcf3819de3d7ee.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4470a8e30de8af6150b4a78ea0637ca7d62b824
---
libavcodec/h263dec.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index fa1146f025..2d8c200589 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -575,7 +575,7 @@ retry:
if ((ret = ff_mpv_frame_start(s, avctx)) < 0)
return ret;
- if (!s->divx_packed && !avctx->hwaccel)
+ if (!s->divx_packed)
ff_thread_finish_setup(avctx);
if (avctx->hwaccel) {
@@ -647,9 +647,6 @@ frame_end:
if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4)
ff_mpeg4_frame_end(avctx, buf, buf_size);
- if (!s->divx_packed && avctx->hwaccel)
- ff_thread_finish_setup(avctx);
-
av_assert1(s->pict_type == s->cur_pic.ptr->f->pict_type);
if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
if ((ret = av_frame_ref(pict, s->cur_pic.ptr->f)) < 0)
More information about the ffmpeg-cvslog
mailing list