The branch, master has been updated
via bdb81d93474ecfc575a88b4028151940b6c8e3c8 (commit)
from b02f1129ebbaaef1c4dc79cd1d68004cab433323 (commit)
- Log -----------------------------------------------------------------
commit bdb81d93474ecfc575a88b4028151940b6c8e3c8
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Sat Sep 13 11:59:01 2025 +0200
Commit: Zhao Zhili <[email protected]>
CommitDate: Sun Sep 14 10:47:57 2025 +0000
avcodec/rkmppdec: Close decoder generically on init failure
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c
index dad0e4c25f..a5ed0fc9b7 100644
--- a/libavcodec/rkmppdec.c
+++ b/libavcodec/rkmppdec.c
@@ -257,7 +257,6 @@ static av_cold int rkmpp_init_decoder(AVCodecContext *avctx)
fail:
av_log(avctx, AV_LOG_ERROR, "Failed to initialize RKMPP decoder.\n");
- rkmpp_close_decoder(avctx);
return ret;
}
@@ -563,7 +562,7 @@ static const AVCodecHWConfigInternal *const
rkmpp_hw_configs[] = {
.hw_configs = rkmpp_hw_configs, \
.bsfs = BSFS, \
.p.wrapper_name = "rkmpp", \
- .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, \
+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_NOT_INIT_THREADSAFE, \
};
RKMPP_DEC(h264, AV_CODEC_ID_H264, "h264_mp4toannexb")
-----------------------------------------------------------------------
Summary of changes:
libavcodec/rkmppdec.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
