bink: Check for out of bound writes when building tree

[ffmpeg] / avprobe.c

diff --git a/avprobe.c b/avprobe.c
index f0ba6bae09a57aabbe95a96a1abeed961d69d755..ae22dac6487c6d25abc2bf279af19ccf7cf8f662 100644 (file)
--- a/avprobe.c
+++ b/avprobe.c
@@ -56,6 +56,11 @@ static const char *unit_hertz_str           = "Hz"   ;
 static const char *unit_byte_str            = "byte" ;
 static const char *unit_bit_per_second_str  = "bit/s";
 
+void exit_program(int ret)
+{
+    exit(ret);
+}
+
 static char *value_string(char *buf, int buf_size, double val, const char *unit)
 {
     if (unit == unit_second_str && use_value_sexagesimal_format) {
@@ -341,7 +346,7 @@ static int opt_format(const char *opt, const char *arg)
     return 0;
 }
 
-static void opt_input_file(const char *arg)
+static void opt_input_file(void *optctx, const char *arg)
 {
     if (input_filename) {
         fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
@@ -394,6 +399,7 @@ int main(int argc, char **argv)
 {
     int ret;
 
+    parse_loglevel(argc, argv, options);
     av_register_all();
     init_opts();
 #if CONFIG_AVDEVICE
@@ -401,7 +407,7 @@ int main(int argc, char **argv)
 #endif
 
     show_banner();
-    parse_options(argc, argv, options, opt_input_file);
+    parse_options(NULL, argc, argv, options, opt_input_file);
 
     if (!input_filename) {
         show_usage();