ac3: detect dba errors and prevent writing past end of array

[ffmpeg] / cmdutils.h

diff --git a/cmdutils.h b/cmdutils.h
index 96fa2084115eaf63c897c5d5dce94e3ba548a4aa..beba333236e22c14885e0b53171f74d9a74f8241 100644 (file)
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -23,12 +23,31 @@
 #define FFMPEG_CMDUTILS_H
 
 #include <inttypes.h>
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
 
 /**
  * program name, defined by the program for show_version().
  */
 extern const char program_name[];
 
+/**
+ * program birth year, defined by the program for show_banner()
+ */
+extern const int program_birth_year;
+
+extern const char **opt_names;
+extern AVCodecContext *avctx_opts[CODEC_TYPE_NB];
+extern AVFormatContext *avformat_opts;
+extern struct SwsContext *sws_opts;
+
+/**
+ * Fallback for options that are not explixitly handled, these will be
+ * parsed through AVOptions.
+ */
+int opt_default(const char *opt, const char *arg);
+
 /**
  * Parses a string and returns its corresponding value as a double.
  * Exits from the application if the string cannot be correctly
@@ -101,16 +120,16 @@ void show_help_options(const OptionDef *options, const char *msg, int mask, int
 void parse_options(int argc, char **argv, const OptionDef *options,
                    void (* parse_arg_function)(const char*));
 
+void set_context_opts(void *ctx, void *opts_ctx, int flags);
+
 void print_error(const char *filename, int err);
 
 /**
  * Prints the program banner to stderr. The banner contents depend on the
  * current version of the repository and of the libav* libraries used by
  * the program.
- * @param program_name name of the program
- * @param program_birth_year year of birth of the program
  */
-void show_banner(const char *program_name, int program_birth_year);
+void show_banner(void);
 
 /**
  * Prints the version of the program to stdout. The version message