[FFmpeg-cvslog] avcodec/adpcm_data: Fix type mismatch for ff_adpcm_afc_coeffs

Andreas Rheinhardt git at videolan.org
Thu Jul 22 09:52:44 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Jun 17 03:34:57 2021 +0200| [ac5bd4e41a01eb45c2909e98d68a434ac58a32e5] | committer: Andreas Rheinhardt

avcodec/adpcm_data: Fix type mismatch for ff_adpcm_afc_coeffs

According to the header it is an array of int16_t, yet it is declared as
uint16_t. Fix this by using int16_t troughout and convert the definition
to use values in the range of int16_t.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavcodec/adpcm_data.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/adpcm_data.c b/libavcodec/adpcm_data.c
index 768a18a378..4c81799bd0 100644
--- a/libavcodec/adpcm_data.c
+++ b/libavcodec/adpcm_data.c
@@ -106,9 +106,9 @@ const int8_t ff_adpcm_yamaha_difflookup[] = {
     -1, -3, -5, -7, -9, -11, -13, -15
 };
 
-const uint16_t ff_adpcm_afc_coeffs[2][16] = {
-    { 0, 2048, 0, 1024, 4096, 3584, 3072, 4608, 4200, 4800, 5120, 2048, 1024, 64512, 64512, 63488 },
-    { 0, 0, 2048, 1024, 63488, 64000, 64512, 62976, 63288, 63236, 62464, 63488, 64512, 1024, 0, 0 }
+const int16_t ff_adpcm_afc_coeffs[2][16] = {
+    { 0, 2048, 0, 1024, 4096, 3584, 3072, 4608, 4200, 4800, 5120, 2048, 1024, -1024, -1024, -2048 },
+    { 0, 0, 2048, 1024, -2048, -1536, -1024, -2560, -2248, -2300, -3072, -2048, -1024, 1024, 0, 0 }
 };
 
 const int16_t ff_adpcm_mtaf_stepsize[32][16] = {



More information about the ffmpeg-cvslog mailing list