diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 15:32:11 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 15:33:44 +0400 |
commit | 7d03732f7e6018c87cc30e2cedb9bd9f7d7e43d7 (patch) | |
tree | 555c92edcc1ca7d172e90cbebc45d715be249409 /ffmpeg.c | |
parent | 22a0249debb1b7dceee4820b6c067be3a7e88ccc (diff) |
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.c')
-rw-r--r-- | ffmpeg.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -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; |