@@ -1079,6 +1079,32 @@ static void print_program_info(int flags, int level)

     av_log(NULL, level, "%sconfiguration: " FFMPEG_CONFIGURATION "\n", indent);

 }

+static void print_buildconf(int flags, int level)

+{

+    const char *indent = flags & INDENT? "  " : "";

+    char str[] = { FFMPEG_CONFIGURATION };

+    char *conflist, *remove_tilde, *splitconf;

+

+    // Change all the ' --' strings to '~--' so that

+    // they can be identified as tokens.

+    while( (conflist = strstr(str, " --")) != NULL ) {

+        strncpy(conflist, "~--", 3);

+    }

+

+    // Compensate for the weirdness this would cause

+    // when passing 'pkg-config --static'.

+    while( (remove_tilde = strstr(str, "pkg-config~")) != NULL ) {

+        strncpy(remove_tilde, "pkg-config ",11);

+    }

+

+    splitconf = strtok(str, "~");

+    av_log(NULL, level, "\n%sconfiguration:\n",indent);

+    while(splitconf != NULL) {

+        av_log(NULL, level, "%s%s%s\n", indent, indent, splitconf);

+        splitconf = strtok(NULL, "~");

+    }

+}

+

 void show_banner(int argc, char **argv, const OptionDef *options)

 {

     int idx = locate_option(argc, argv, options, "version");

@@ -1099,6 +1125,14 @@ int show_version(void *optctx, const char *opt, const char *arg)

     return 0;

 }

+int show_buildconf(void *optctx, const char *opt, const char *arg)

+{

+    av_log_set_callback(log_callback_help);

+    print_buildconf      (INDENT|0, AV_LOG_INFO);

+

+    return 0;

+}

+

 int show_license(void *optctx, const char *opt, const char *arg)

 {

 #if CONFIG_NONFREE

@@ -415,6 +415,13 @@ void show_banner(int argc, char **argv, const OptionDef *options);

 int show_version(void *optctx, const char *opt, const char *arg);

 /**

+ * Print the build configuration of the program to stdout. The contents

+ * depend on the definition of FFMPEG_CONFIGURATION.

+ * This option processing function does not utilize the arguments.

+ */

+int show_buildconf(void *optctx, const char *opt, const char *arg);

+

+/**

  * Print the license of the program to stdout. The license depends on

  * the license of the libraries compiled into the program.

  * This option processing function does not utilize the arguments.

@@ -4,6 +4,7 @@

     { "help"       , OPT_EXIT, {.func_arg = show_help},         "show help", "topic" },

     { "-help"      , OPT_EXIT, {.func_arg = show_help},         "show help", "topic" },

     { "version"    , OPT_EXIT, {.func_arg = show_version},      "show version" },

+    { "buildconf"  , OPT_EXIT, {.func_arg = show_buildconf},    "show build configuration" },

     { "formats"    , OPT_EXIT, {.func_arg = show_formats  },    "show available formats" },

     { "codecs"     , OPT_EXIT, {.func_arg = show_codecs   },    "show available codecs" },

     { "decoders"   , OPT_EXIT, {.func_arg = show_decoders },    "show available decoders" },