If a frame-threaded decoder with inter-frame dependencies
returns an error when decoding a frame and the returned frame
isn't clean, an error message is emitted claiming that this
is a bug. This seems to be based upon the thinking that
in this case a ThreadFrame has not been properly unreferenced.
Yet this is wrong, as decoders with inter-frame dependencies
don't use the frame for output for synchronization and therefore
don't use ThreadFrames at all for this. So unreferencing
this frame generically is fine and not a bug.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
I hope my guess of the rationale for this message was correct;
apologies if not.
libavcodec/pthread_frame.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index 27ed0b2cc4..33b5a2e628 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -219,12 +219,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
p->got_frame = 0;
p->result = codec->decode(avctx, p->frame, &p->got_frame, p->avpkt);
- if ((p->result < 0 || !p->got_frame) && p->frame->buf[0]) {
- if (avctx->codec->caps_internal & FF_CODEC_CAP_ALLOCATE_PROGRESS)
- av_log(avctx, AV_LOG_ERROR, "A frame threaded decoder did not "
- "free the frame on failure. This is a bug, please
report it.\n");
+ if ((p->result < 0 || !p->got_frame) && p->frame->buf[0])
ff_thread_release_buffer(avctx, p->frame);
- }
if (atomic_load(&p->state) == STATE_SETTING_UP)
ff_thread_finish_setup(avctx);
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
