summaryrefslogtreecommitdiff
path: root/ffmpeg.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-04 13:32:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-04 13:33:44 +0200
commit7d03732f7e6018c87cc30e2cedb9bd9f7d7e43d7 (patch)
tree555c92edcc1ca7d172e90cbebc45d715be249409 /ffmpeg.h
parent22a0249debb1b7dceee4820b6c067be3a7e88ccc (diff)
downloadffmpeg-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.h')
-rw-r--r--ffmpeg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.h b/ffmpeg.h
index 30890a0ee8..06ef13243a 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -502,6 +502,7 @@ void show_usage(void);
void opt_output_file(void *optctx, const char *filename);
+void remove_avoptions(AVDictionary **a, AVDictionary *b);
void assert_avoptions(AVDictionary *m);
int guess_input_channel_layout(InputStream *ist);