Merge remote-tracking branch 'qatar/master'

[ffmpeg] / cmdutils.h

diff --git a/cmdutils.h b/cmdutils.h
index 26cd96a131cbf6d238b1d86b1b1e14cbd448ee4e..07a8d32a2caba481a24a7f18d7a7e639abaa2dbc 100644 (file)
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -51,6 +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 *format_opts, *codec_opts;
 
 /**
@@ -357,7 +358,7 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size);
  * at configuration time or in a "ffpresets" folder along the executable
  * on win32, in that order. If no such file is found and
  * codec_name is defined, then search for a file named
- * codec_name-preset_name.ffpreset in the above-mentioned directories.
+ * codec_name-preset_name.avpreset in the above-mentioned directories.
  *
  * @param filename buffer where the name of the found filename is written
  * @param filename_size size in bytes of the filename buffer