[FFmpeg-cvslog] Fix type of shared flac table ff_flac_blocksize_table[].
Carl Eugen Hoyos
git at videolan.org
Sun May 5 21:01:12 CEST 2013
ffmpeg | branch: release/0.8 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun May 5 19:29:00 2013 +0200| [e2d529424f3f8c6908c9d91e5f1f842afd136ab6] | committer: Carl Eugen Hoyos
Fix type of shared flac table ff_flac_blocksize_table[].
Fixes ticket #2533.
(cherry picked from commit a07ac1f7888fd08e42da2bed0421e74f1cfac177)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2d529424f3f8c6908c9d91e5f1f842afd136ab6
---
libavcodec/flacdata.c | 2 +-
libavcodec/flacdata.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/flacdata.c b/libavcodec/flacdata.c
index 6fcbe39..1954f32 100644
--- a/libavcodec/flacdata.c
+++ b/libavcodec/flacdata.c
@@ -27,7 +27,7 @@ const int ff_flac_sample_rate_table[16] =
8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000,
0, 0, 0, 0 };
-const int16_t ff_flac_blocksize_table[16] = {
+const int32_t ff_flac_blocksize_table[16] = {
0, 192, 576<<0, 576<<1, 576<<2, 576<<3, 0, 0,
256<<0, 256<<1, 256<<2, 256<<3, 256<<4, 256<<5, 256<<6, 256<<7
};
diff --git a/libavcodec/flacdata.h b/libavcodec/flacdata.h
index 96a50b9..e2c1e5d 100644
--- a/libavcodec/flacdata.h
+++ b/libavcodec/flacdata.h
@@ -26,6 +26,6 @@
extern const int ff_flac_sample_rate_table[16];
-extern const int16_t ff_flac_blocksize_table[16];
+extern const int32_t ff_flac_blocksize_table[16];
#endif /* AVCODEC_FLACDATA_H */
More information about the ffmpeg-cvslog
mailing list