This way protocol or format related options can be set for all
of the files opened during concatenation.
---
libavformat/concatdec.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 6d5b9914f9..3c81d9fea6 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -66,6 +66,7 @@ typedef struct {
ConcatMatchMode stream_match_mode;
unsigned auto_convert;
int segment_time_metadata;
+ AVDictionary *input_options;
} ConcatContext;
static int concat_probe(const AVProbeData *probe)
@@ -329,6 +330,7 @@ static int open_file(AVFormatContext *avf, unsigned fileno)
{
ConcatContext *cat = avf->priv_data;
ConcatFile *file = &cat->files[fileno];
+ AVDictionary *options = NULL;
int ret;
if (cat->avf)
@@ -344,12 +346,31 @@ static int open_file(AVFormatContext *avf, unsigned
fileno)
if ((ret = ff_copy_whiteblacklists(cat->avf, avf)) < 0)
return ret;
- if ((ret = avformat_open_input(&cat->avf, file->url, NULL, NULL)) < 0 ||
+ if (cat->input_options &&
+ (ret = av_dict_copy(&options, cat->input_options, 0) < 0))
+ return ret;
+
+ if ((ret = avformat_open_input(&cat->avf, file->url, NULL, &options)) < 0
||
(ret = avformat_find_stream_info(cat->avf, NULL)) < 0) {
av_log(avf, AV_LOG_ERROR, "Impossible to open '%s'\n", file->url);
avformat_close_input(&cat->avf);
+ av_dict_free(&options);
return ret;
}
+
+ if (av_dict_count(options)) {
+ AVDictionaryEntry *en = NULL;
+
+ while ((en = av_dict_get(options, "", en, AV_DICT_IGNORE_SUFFIX))) {
+ av_log(avf, AV_LOG_WARNING,
+ "Option '%s' set to '%s' was ignored when opening %s "
+ "with the %s reader!\n",
+ en->key, en->value, file->url, cat->avf->iformat->name);
+ }
+ }
+
+ av_dict_free(&options);
+
cat->cur_file = file;
file->start_time = !fileno ? 0 :
cat->files[fileno - 1].start_time +
@@ -764,6 +785,9 @@ static const AVOption options[] = {
OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC },
{ "segment_time_metadata", "output file segment start time and duration as
packet metadata",
OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
+ { "input_options",
+ "set options for all opened inputs using a :-separated list of key=value
pairs",
+ OFFSET(input_options), AV_OPT_TYPE_DICT, { .str = NULL }, 0, 0, DEC },
{ NULL }
};
--
2.29.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
