avformat/hls: Print input format in error message

michaelni · michaelni · commit 9dea077922bc · 2025-02-26T01:26:30.000+01:00
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d845533) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
diff --git a/libavformat/hls.c b/libavformat/hls.c
@@ -758,7 +758,7 @@ static int test_segment(AVFormatContext *s, const AVInputFormat *in_fmt, struct
             matchF = 3;
 
         if (!(matchA & matchF)) {
-            av_log(s, AV_LOG_ERROR, "detected format extension %s mismatches allowed extensions in url %s\n", in_fmt->extensions ? in_fmt->extensions : "none", seg->url);
+            av_log(s, AV_LOG_ERROR, "detected format %s extension %s mismatches allowed extensions in url %s\n", in_fmt->name, in_fmt->extensions ? in_fmt->extensions : "none", seg->url);
             return AVERROR_INVALIDDATA;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ static int test_segment(AVFormatContext s, const AVInputFormat in_fmt, struct`
`758`	`758`	`matchF = 3;`
`759`	`759`
`760`	`760`	`if (!(matchA & matchF)) {`
`761`		`- av_log(s, AV_LOG_ERROR, "detected format extension %s mismatches allowed extensions in url %s\n", in_fmt->extensions ? in_fmt->extensions : "none", seg->url);`
	`761`	`+ av_log(s, AV_LOG_ERROR, "detected format %s extension %s mismatches allowed extensions in url %s\n", in_fmt->name, in_fmt->extensions ? in_fmt->extensions : "none", seg->url);`
`762`	`762`	`return AVERROR_INVALIDDATA;`
`763`	`763`	`}`
`764`	`764`	`}`