From 7d03732f7e6018c87cc30e2cedb9bd9f7d7e43d7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer 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 --- ffmpeg.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ffmpeg.h') 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); -- cgit v1.2.3