Message ID | 20201014130915.25948-7-zane@zanevaniperen.com |
---|---|
State | Accepted |
Headers | show |
Series | [FFmpeg-devel,1/7] avcodec/adpcmenc: add "block_size" option | expand |
Context | Check | Description |
---|---|---|
andriy/PPC64_make | warning | Make failed |
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
diff --git a/libavcodec/adpcm.h b/libavcodec/adpcm.h index dc0d49ac61..0ffc3da1d0 100644 --- a/libavcodec/adpcm.h +++ b/libavcodec/adpcm.h @@ -28,8 +28,6 @@ #include <stdint.h> -#define BLKSIZE 1024 - typedef struct ADPCMChannelStatus { int predictor; int16_t step_index; diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 83c7e7ee05..bb59cb9849 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -857,7 +857,7 @@ static const AVOption options[] = { .help = "set the block size", .offset = offsetof(ADPCMEncodeContext, block_size), .type = AV_OPT_TYPE_INT, - .default_val = {.i64 = BLKSIZE}, + .default_val = {.i64 = 1024}, .min = 32, .max = 8192, /* FIXME: Reasonable upper limit? */ .flags = AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com> --- libavcodec/adpcm.h | 2 -- libavcodec/adpcmenc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)