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_opt.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ffmpeg_opt.c')

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 99182e0914..9604a6a5d5 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 */
-- 
cgit v1.2.3