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: 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 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'ffmpeg.c')

diff --git a/ffmpeg.c b/ffmpeg.c
index 1c1a5599d0..8dd9c08452 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;
-- 
cgit v1.2.3