Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'

[ffmpeg] / cmdutils.h

diff --git a/cmdutils.h b/cmdutils.h
index 3e3d002e7acc2228e8975bc4412d66562f86a627..08c92ce6ee21a8d953da52cf98c9892d67f3b628 100644 (file)
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -51,7 +51,7 @@ extern const int this_year;
 extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
 extern AVFormatContext *avformat_opts;
 extern struct SwsContext *sws_opts;
-extern struct SwrContext *swr_opts;
+extern AVDictionary *swr_opts;
 extern AVDictionary *format_opts, *codec_opts, *resample_opts;
 
 /**
@@ -255,7 +255,7 @@ typedef struct OptionGroup {
     AVDictionary *format_opts;
     AVDictionary *resample_opts;
     struct SwsContext *sws_opts;
-    struct SwrContext *swr_opts;
+    AVDictionary *swr_opts;
 } OptionGroup;
 
 /**