Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH] avformat/demux: Fix segfault due to avcodec_open2 failure (v2)
@ 2025-06-10  3:45 Pavel Koshevoy
  2025-06-10 13:38 ` Michael Niedermayer
  0 siblings, 1 reply; 12+ messages in thread
From: Pavel Koshevoy @ 2025-06-10  3:45 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Pavel Koshevoy

Fixes 'ffprobe 1_poc.mp4' segfault introduced with
commit 0021484d05f9b0f032fa319399de6e24eea0c04f

codec_close should not assume that the codec_id did not change.
---
 libavformat/demux.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libavformat/demux.c b/libavformat/demux.c
index ecd4f40da9..3749ab67a3 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -1292,9 +1292,15 @@ static int codec_close(FFStream *sti)
 {
     AVCodecContext *avctx_new = NULL;
     AVCodecParameters *par_tmp = NULL;
+    const AVCodec *new_codec = NULL;
     int ret;
 
-    avctx_new = avcodec_alloc_context3(sti->avctx->codec);
+    new_codec =
+      (sti->avctx->codec_id != sti->pub.codecpar->codec_id) ?
+      avcodec_find_decoder(sti->pub.codecpar->codec_id) :
+      sti->avctx->codec;
+
+    avctx_new = avcodec_alloc_context3(new_codec);
     if (!avctx_new) {
         ret = AVERROR(ENOMEM);
         goto fail;
-- 
2.43.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-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2025-06-11 15:51 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-06-10  3:45 [FFmpeg-devel] [PATCH] avformat/demux: Fix segfault due to avcodec_open2 failure (v2) Pavel Koshevoy
2025-06-10 13:38 ` Michael Niedermayer
2025-06-10 14:42   ` Pavel Koshevoy
2025-06-10 15:29     ` Michael Niedermayer
2025-06-10 15:39       ` Pavel Koshevoy
2025-06-10 17:27       ` Pavel Koshevoy
2025-06-10 17:30         ` Nicolas George
2025-06-10 17:54           ` Pavel Koshevoy
2025-06-10 22:10         ` Michael Niedermayer
2025-06-10 23:36           ` Pavel Koshevoy
2025-06-11 10:14             ` Michael Niedermayer
2025-06-11 15:51             ` Michael Niedermayer

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