aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C

[ffmpeg] / cmdutils.h

diff --git a/cmdutils.h b/cmdutils.h
index 8cbac1f5267cee37f877dcecd9c0d1eb37f5b421..5c5e57cbbe851c6c411b4144d20ca866e9cad18c 100644 (file)
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -189,6 +189,12 @@ int parse_option(void *optctx, const char *opt, const char *arg,
  */
 void parse_loglevel(int argc, char **argv, const OptionDef *options);
 
+/**
+ * Return index of option opt in argv or 0 if not found.
+ */
+int locate_option(int argc, char **argv, const OptionDef *options,
+                  const char *optname);
+
 /**
  * Check if the given stream matches a stream specifier.
  *
@@ -345,11 +351,11 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
  * Get a file corresponding to a preset file.
  *
  * 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
+ * Otherwise search for a file named arg.avpreset in the directories
  * $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.
+ * 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
@@ -363,9 +369,9 @@ FILE *get_preset_file(char *filename, size_t filename_size,
 
 typedef struct {
     enum PixelFormat pix_fmt;
-} FFSinkContext;
+} SinkContext;
 
-extern AVFilter ffsink;
+extern AVFilter sink;
 
 /**
  * Extract a frame from sink.