allows user-settable block size and fixes related typo
Originally committed as revision 5674 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
bac3be382e
commit
c6375bf23c
@ -330,7 +330,7 @@ static int flac_encode_init(AVCodecContext *avctx)
|
||||
|
||||
if(avctx->frame_size > 0) {
|
||||
if(avctx->frame_size < FLAC_MIN_BLOCKSIZE ||
|
||||
avctx->frame_size > FLAC_MIN_BLOCKSIZE) {
|
||||
avctx->frame_size > FLAC_MAX_BLOCKSIZE) {
|
||||
av_log(avctx, AV_LOG_ERROR, "invalid block size: %d\n",
|
||||
avctx->frame_size);
|
||||
return -1;
|
||||
|
@ -499,7 +499,7 @@ static const AVOption options[]={
|
||||
{"sample_rate", NULL, OFFSET(sample_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
|
||||
{"channels", NULL, OFFSET(channels), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
|
||||
{"cutoff", "set cutoff bandwidth", OFFSET(cutoff), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, A|E},
|
||||
{"frame_size", NULL, OFFSET(frame_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
|
||||
{"frame_size", NULL, OFFSET(frame_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, A|E},
|
||||
{"frame_number", NULL, OFFSET(frame_number), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
|
||||
{"real_pict_num", NULL, OFFSET(real_pict_num), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
|
||||
{"delay", NULL, OFFSET(delay), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
|
||||
|
Loading…
x
Reference in New Issue
Block a user