diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-05-05 19:29:00 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-05-05 20:39:42 +0200 |
| commit | 48f0a2c2394c73b85c4944cd7c8451f6f5c7c5bb (patch) | |
| tree | 7aecffa254b02e28d2a9de3beb23d6cd821839d6 | |
| parent | 0b8198346150192579a6b9c2b3c8a7822f4bf5cb (diff) | |
| download | ffmpeg-48f0a2c2394c73b85c4944cd7c8451f6f5c7c5bb.tar.gz | |
Fix type of shared flac table ff_flac_blocksize_table[].
Fixes ticket #2533.
(cherry picked from commit a07ac1f7888fd08e42da2bed0421e74f1cfac177)
| -rw-r--r-- | libavcodec/flacdata.c | 2 | ||||
| -rw-r--r-- | libavcodec/flacdata.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/flacdata.c b/libavcodec/flacdata.c index 6fcbe3955a..1954f32d32 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 96a50b9183..e2c1e5d7f2 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 */ |