aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-08-28 14:43:54 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-04 13:12:00 +0200
commit7cc8d6385aaf1005700305f21d5d56b51b38c537 (patch)
tree73aff2665f8eef3fb60f7babe7403692f3d67b0f /ffmpeg.c
parent7efe05ab298ae18437c9796f43b9f47474763a39 (diff)
downloadffmpeg-7cc8d6385aaf1005700305f21d5d56b51b38c537.tar.gz
cmdutils: add support for caller-provided option context.
This is the first step to removing the globals plague from avtools.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 242cd3ffa7..a440b9dacb 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3702,7 +3702,7 @@ static int opt_streamid(const char *opt, const char *arg)
return 0;
}
-static void opt_output_file(const char *filename)
+static void opt_output_file(void *optctx, const char *filename)
{
AVFormatContext *oc;
int err, use_video, use_audio, use_subtitle, use_data;
@@ -4376,7 +4376,7 @@ int main(int argc, char **argv)
"(see Changelog for the list of incompatible changes).\n");
/* parse options */
- parse_options(argc, argv, options, opt_output_file);
+ parse_options(NULL, argc, argv, options, opt_output_file);
if(nb_output_files <= 0 && nb_input_files == 0) {
show_usage();