[SCM] libav/experimental: ff_swb_offset_* tables should be const.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:50:49 UTC 2013
The following commit has been merged in the experimental branch:
commit 7eb1c3643184e15b72787e66755a4fd2593d4afa
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Sun Sep 6 08:48:45 2009 +0000
ff_swb_offset_* tables should be const.
Originally committed as revision 19782 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c
index 8d7fa62..49a9cfd 100644
--- a/libavcodec/aactab.c
+++ b/libavcodec/aactab.c
@@ -1003,7 +1003,7 @@ static const uint16_t swb_offset_128_8[] = {
36, 44, 52, 60, 72, 88, 108, 128
};
-const uint16_t *ff_swb_offset_1024[] = {
+const uint16_t * const ff_swb_offset_1024[] = {
swb_offset_1024_96, swb_offset_1024_96, swb_offset_1024_64,
swb_offset_1024_48, swb_offset_1024_48, swb_offset_1024_32,
swb_offset_1024_24, swb_offset_1024_24, swb_offset_1024_16,
@@ -1011,7 +1011,7 @@ const uint16_t *ff_swb_offset_1024[] = {
swb_offset_1024_8
};
-const uint16_t *ff_swb_offset_128[] = {
+const uint16_t * const ff_swb_offset_128[] = {
/* The last entry on the following row is swb_offset_128_64 but is a
duplicate of swb_offset_128_96. */
swb_offset_128_96, swb_offset_128_96, swb_offset_128_96,
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index fd0929c..061a4e9 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -65,8 +65,8 @@ extern const uint16_t ff_aac_spectral_sizes[11];
extern const float *ff_aac_codebook_vectors[];
-extern const uint16_t *ff_swb_offset_1024[13];
-extern const uint16_t *ff_swb_offset_128 [13];
+extern const uint16_t * const ff_swb_offset_1024[13];
+extern const uint16_t * const ff_swb_offset_128 [13];
extern const uint8_t ff_tns_max_bands_1024[13];
extern const uint8_t ff_tns_max_bands_128 [13];
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list