From 7d03732f7e6018c87cc30e2cedb9bd9f7d7e43d7 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 4 Aug 2014 13:32:11 +0200
Subject: [PATCH] ffmpeg: Do not fail if a demuxer and decoder use the same
option identifer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
ffmpeg.c | 9 +++++++++
ffmpeg.h | 1 +
ffmpeg_opt.c | 1 +
3 files changed, 11 insertions(+)
diff --git a/ffmpeg.c b/ffmpeg.c
index 1c1a5599d0a..8dd9c08452f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -532,6 +532,15 @@ static void ffmpeg_cleanup(int ret)
term_exit();
}
+void remove_avoptions(AVDictionary **a, AVDictionary *b)
+{
+ AVDictionaryEntry *t = NULL;
+
+ while ((t = av_dict_get(b, "", t, AV_DICT_IGNORE_SUFFIX))) {
+ av_dict_set(a, t->key, NULL, AV_DICT_MATCH_CASE);
+ }
+}
+
void assert_avoptions(AVDictionary *m)
{
AVDictionaryEntry *t;
diff --git a/ffmpeg.h b/ffmpeg.h
index 30890a0ee85..06ef13243ac 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -502,6 +502,7 @@ void show_usage(void);
void opt_output_file(void *optctx, const char *filename);
+void remove_avoptions(AVDictionary **a, AVDictionary *b);
void assert_avoptions(AVDictionary *m);
int guess_input_channel_layout(InputStream *ist);
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 99182e0914c..9604a6a5d52 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -872,6 +872,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
print_error(filename, err);
exit_program(1);
}
+ remove_avoptions(&o->g->format_opts, o->g->codec_opts);
assert_avoptions(o->g->format_opts);
/* apply forced codec ids */
--
GitLab