* [FFmpeg-devel] [PATCH] avcodec/rkmppdec: Close decoder generically on init failure (PR #20512)
@ 2025-09-13 10:03 mkver via ffmpeg-devel
0 siblings, 0 replies; only message in thread
From: mkver via ffmpeg-devel @ 2025-09-13 10:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: mkver
PR #20512 opened by mkver
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20512
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20512.patch
>From 6f07c9da0dd143e24e50f7cfb2030d7e885e5f71 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Sat, 13 Sep 2025 11:59:01 +0200
Subject: [PATCH] avcodec/rkmppdec: Close decoder generically on init failure
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/rkmppdec.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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")
--
2.49.1
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-09-13 10:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-09-13 10:03 [FFmpeg-devel] [PATCH] avcodec/rkmppdec: Close decoder generically on init failure (PR #20512) mkver via ffmpeg-devel
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git