virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

Fix prototype and return value of opt_bitrate and opt_bsf.

Browse Source 
Patch by Morten Hustveit: lists rashbox org

Originally committed as revision 11370 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Morten Hustveit 2008-01-02 10:24:36 +00:00 committed by Benoit Fouet
parent 464a631c34
commit ebde2a2cd8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg.c
View File

@ -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; 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) 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"); 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) static void opt_frame_crop_top(const char *arg)
@ -3671,7 +3673,7 @@ static void opt_vstats (void)
opt_vstats_file(filename); 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 *bsfc= av_bitstream_filter_init(arg); //FIXME split name and args for filter at '='
AVBitStreamFilterContext **bsfp; AVBitStreamFilterContext **bsfp;
@ -3686,6 +3688,8 @@ static void opt_bsf(const char *opt, const char *arg)
bsfp= &(*bsfp)->next; bsfp= &(*bsfp)->next;
*bsfp= bsfc; *bsfp= bsfc;
return 0;
} }
static void opt_show_license(void) static void opt_show_license(void)