[FFmpeg-cvslog] avcodec/adpcmenc: remove BLKSIZE #define

Zane van Iperen git at videolan.org
Sat Oct 17 03:05:56 EEST 2020


ffmpeg | branch: master | Zane van Iperen <zane at zanevaniperen.com> | Wed Oct 14 22:56:49 2020 +1000| [bf4a253f3829a1faf5c8ba30bf79cd7170e87af8] | committer: Zane van Iperen

avcodec/adpcmenc: remove BLKSIZE #define

Signed-off-by: Zane van Iperen <zane at zanevaniperen.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf4a253f3829a1faf5c8ba30bf79cd7170e87af8
---

 libavcodec/adpcm.h    | 2 --
 libavcodec/adpcmenc.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

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 725d418edc..b2be83b84e 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, /* Is this a reasonable upper limit? */
         .flags       = AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM



More information about the ffmpeg-cvslog mailing list