From ebde2a2cd8ebd86a7927ef9c1a4472581c3c3612 Mon Sep 17 00:00:00 2001 From: Morten Hustveit Date: Wed, 2 Jan 2008 10:24:36 +0000 Subject: Fix prototype and return value of opt_bitrate and opt_bsf. Patch by Morten Hustveit: lists rashbox org Originally committed as revision 11370 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index e81747072a..6c22053c24 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2180,7 +2180,7 @@ static void opt_frame_rate(const char *arg) } } -static void opt_bitrate(const char *opt, const char *arg) +static int opt_bitrate(const char *opt, const char *arg) { int codec_type = opt[0]=='a' ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO; @@ -2188,6 +2188,8 @@ static void opt_bitrate(const char *opt, const char *arg) if (av_get_int(avctx_opts[codec_type], "b", NULL) < 1000) fprintf(stderr, "WARNING: The bitrate parameter is set too low. It takes bits/s as argument, not kbits/s\n"); + + return 0; } static void opt_frame_crop_top(const char *arg) @@ -3671,7 +3673,7 @@ static void opt_vstats (void) opt_vstats_file(filename); } -static void opt_bsf(const char *opt, const char *arg) +static int opt_bsf(const char *opt, const char *arg) { AVBitStreamFilterContext *bsfc= av_bitstream_filter_init(arg); //FIXME split name and args for filter at '=' AVBitStreamFilterContext **bsfp; @@ -3686,6 +3688,8 @@ static void opt_bsf(const char *opt, const char *arg) bsfp= &(*bsfp)->next; *bsfp= bsfc; + + return 0; } static void opt_show_license(void) -- cgit v1.2.3