diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-10-14 23:48:23 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-10-19 20:30:48 +0200 |
| commit | 10f468156c0109a06854b5d672c5209a88923ce9 (patch) | |
| tree | 2cba12cbd22ba8d3303d677ace8182dd645c9e96 /libavcodec/sinewin.h | |
| parent | feb05ffa99fc3633e5dd97916ac67dc4e7c76ab2 (diff) | |
| download | ffmpeg-10f468156c0109a06854b5d672c5209a88923ce9.tar.gz | |
lavc/sinewin: Do not declare AAC 120/960 tables as const.
ff_sine_window_init() is writing to these tables causing
a crash if compiled with gcc 8 and lto.
Analyzed by Martin Liška in:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85132
Fixes ticket #7491.
Diffstat (limited to 'libavcodec/sinewin.h')
| -rw-r--r-- | libavcodec/sinewin.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/sinewin.h b/libavcodec/sinewin.h index 6b97a7185f..329e9bb5be 100644 --- a/libavcodec/sinewin.h +++ b/libavcodec/sinewin.h @@ -38,6 +38,9 @@ #define SINETABLE(size) \ SINETABLE_CONST DECLARE_ALIGNED(32, INTFLOAT, AAC_RENAME(ff_sine_##size))[size] +#define SINETABLE120960(size) \ + DECLARE_ALIGNED(32, INTFLOAT, AAC_RENAME(ff_sine_##size))[size] + /** * Generate a sine window. * @param window pointer to half window @@ -52,11 +55,11 @@ void AAC_RENAME(ff_init_ff_sine_windows)(int index); extern SINETABLE( 32); extern SINETABLE( 64); -extern SINETABLE( 120); +extern SINETABLE120960(120); extern SINETABLE( 128); extern SINETABLE( 256); extern SINETABLE( 512); -extern SINETABLE( 960); +extern SINETABLE120960(960); extern SINETABLE(1024); extern SINETABLE(2048); extern SINETABLE(4096); |