Merge commit 'd395895cdb2ac8c95bd488549e7f893bd4dcc248'

[ffmpeg] / ffmpeg_opt.c

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 99182e0914cb20bdb8187473dfc986ff71064dbe..9604a6a5d52e8c45d2f8e0caa28c7952d96f2627 100644 (file)
--- 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 */