X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cmdutils.h;h=55a06dd096abfb004c04184d965f5b73b4ee3e78;hb=d1241ff3b289b49607910258e3e99a050a6df65a;hp=a20b779f1a02f3db712add66ccc7be095fad9c56;hpb=182cbe433aea20b0d9627d40de7c75713ec736db;p=ffmpeg

diff --git a/cmdutils.h b/cmdutils.h
index a20b779f1a0..55a06dd096a 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -154,6 +154,12 @@ typedef struct {
 
 void show_help_options(const OptionDef *options, const char *msg, int mask, int value);
 
+/**
+ * Show help for all options with given flags in class and all its
+ * children.
+ */
+void show_help_children(const AVClass *class, int flags);
+
 /**
  * Parse the command line arguments.
  *
@@ -303,7 +309,7 @@ int read_yesno(void);
  * @return 0 in case of success, a negative value corresponding to an
  * AVERROR error code in case of failure.
  */
-int read_file(const char *filename, char **bufptr, size_t *size);
+int cmdutils_read_file(const char *filename, char **bufptr, size_t *size);
 
 typedef struct {
     int64_t num_faulty_pts; /// Number of incorrect PTS values so far
@@ -334,7 +340,7 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
  *
  * If is_path is non-zero, look for the file in the path preset_name.
  * Otherwise search for a file named arg.ffpreset in the directories
- * $FFMPEG_DATADIR (if set), $HOME/.ffmpeg, and in the datadir defined
+ * $AVCONV_DATADIR (if set), $HOME/.avconv, and in the datadir defined
  * at configuration time, 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.