diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 13:32:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 13:33:44 +0200 |
| commit | 7d03732f7e6018c87cc30e2cedb9bd9f7d7e43d7 (patch) | |
| tree | 555c92edcc1ca7d172e90cbebc45d715be249409 /ffmpeg_opt.c | |
| parent | 22a0249debb1b7dceee4820b6c067be3a7e88ccc (diff) | |
| download | ffmpeg-7d03732f7e6018c87cc30e2cedb9bd9f7d7e43d7.tar.gz | |
ffmpeg: Do not fail if a demuxer and decoder use the same option identifer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |