summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-06-04 23:54:19 +0200
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-06-05 13:21:02 +0200
commit96f931adf75967dc86fbf3ee21517e539d0a6e50 (patch)
tree83b2cb96c70525ef2801162e20fac07466ff45a7 /ffmpeg.c
parent0d0fdb0ad59c0533fb91dad00379f762573ce541 (diff)
cmdutils: change the signature of the function argument in parse_options()
This is required for a pending simplification.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 99546f7ae0..3cfd5ca060 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3855,7 +3855,7 @@ static int opt_streamid(const char *opt, const char *arg)
return 0;
}
-static void opt_output_file(const char *filename)
+static int opt_output_file(const char *opt, const char *filename)
{
AVFormatContext *oc;
int err, use_video, use_audio, use_subtitle, use_data;
@@ -3984,6 +3984,7 @@ static void opt_output_file(const char *filename)
av_freep(&forced_key_frames);
uninit_opts();
init_opts();
+ return 0;
}
/* same option as mencoder */