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] libavformat/avformat: Check codec whitelist
@ 2022-05-17 22:08 Eric Juteau
  2022-05-26 20:55 ` Eric Juteau
  0 siblings, 1 reply; 2+ messages in thread
From: Eric Juteau @ 2022-05-17 22:08 UTC (permalink / raw)
  To: ffmpeg-devel

Modified the function av_find_best_stream() such that, when a list of allowed codecs is supplied in the format context, and when the caller is requesting a decoder be returned, the function will select the best stream that has a decoder in the allowed decoders list.

Signed-off-by: Eric Juteau <ericjut@outlook.com>
---
 libavformat/avformat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/avformat.c b/libavformat/avformat.c
index 30d6ea6a49..396c1affa1 100644
--- a/libavformat/avformat.c
+++ b/libavformat/avformat.c
@@ -376,7 +376,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
             continue;
         if (decoder_ret) {
             decoder = ff_find_decoder(ic, st, par->codec_id);
-            if (!decoder) {
+            if ((!decoder) ||
+                (ic->codec_whitelist && av_match_list(decoder->name, ic->codec_whitelist, ',') <= 0)) {
                 if (ret < 0)
                     ret = AVERROR_DECODER_NOT_FOUND;
                 continue;
-- 
2.17.1

_______________________________________________
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] 2+ messages in thread

* Re: [FFmpeg-devel] [PATCH] libavformat/avformat: Check codec whitelist
  2022-05-17 22:08 [FFmpeg-devel] [PATCH] libavformat/avformat: Check codec whitelist Eric Juteau
@ 2022-05-26 20:55 ` Eric Juteau
  0 siblings, 0 replies; 2+ messages in thread
From: Eric Juteau @ 2022-05-26 20:55 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Friendly ping for feedback on this patch.

Thank you in advance.

-----Original Message-----
From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Eric Juteau
Sent: Tuesday, May 17, 2022 3:09 PM
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] libavformat/avformat: Check codec whitelist

Modified the function av_find_best_stream() such that, when a list of allowed codecs is supplied in the format context, and when the caller is requesting a decoder be returned, the function will select the best stream that has a decoder in the allowed decoders list.

Signed-off-by: Eric Juteau <ericjut@outlook.com>
---
 libavformat/avformat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 30d6ea6a49..396c1affa1 100644
--- a/libavformat/avformat.c
+++ b/libavformat/avformat.c
@@ -376,7 +376,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
             continue;
         if (decoder_ret) {
             decoder = ff_find_decoder(ic, st, par->codec_id);
-            if (!decoder) {
+            if ((!decoder) ||
+                (ic->codec_whitelist && av_match_list(decoder->name, 
+ ic->codec_whitelist, ',') <= 0)) {
                 if (ret < 0)
                     ret = AVERROR_DECODER_NOT_FOUND;
                 continue;
--
2.17.1

_______________________________________________
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".
_______________________________________________
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] 2+ messages in thread

end of thread, other threads:[~2022-05-26 20:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-17 22:08 [FFmpeg-devel] [PATCH] libavformat/avformat: Check codec whitelist Eric Juteau
2022-05-26 20:55 ` Eric Juteau

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