diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:34:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:34:29 +0200 |
| commit | 0aa095483d194c0cfe6acc6dd4c72e545312676e (patch) | |
| tree | 67884d80009d760bcb0889ca410c3c4fee32e9db /libavcodec/aacpsy.c | |
| parent | 057c5d2e1646ee9536edf514b41690c8ffeef6fc (diff) | |
| parent | 6fee1b90ce3bf4fbdfde7016e0890057c9000487 (diff) | |
| download | ffmpeg-streaming-0aa095483d194c0cfe6acc6dd4c72e545312676e.zip ffmpeg-streaming-0aa095483d194c0cfe6acc6dd4c72e545312676e.tar.gz | |
Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'
* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487':
avcodec: Add av_cold attributes to init functions missing them
Conflicts:
libavcodec/aacpsy.c
libavcodec/atrac3.c
libavcodec/dvdsubdec.c
libavcodec/ffv1.c
libavcodec/ffv1enc.c
libavcodec/h261enc.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/libschroedingerenc.c
libavcodec/libxvid_rc.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/proresdsp.c
libavcodec/rangecoder.c
libavcodec/videodsp.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsy.c')
| -rw-r--r-- | libavcodec/aacpsy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 51c669a..d2a782e 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -24,6 +24,7 @@ * AAC encoder psychoacoustic model */ +#include "libavutil/attributes.h" #include "libavutil/libm.h" #include "avcodec.h" @@ -254,7 +255,8 @@ static float lame_calc_attack_threshold(int bitrate) /** * LAME psy model specific initialization */ -static void lame_window_init(AacPsyContext *ctx, AVCodecContext *avctx) { +static av_cold void lame_window_init(AacPsyContext *ctx, AVCodecContext *avctx) +{ int i, j; for (i = 0; i < avctx->channels; i++) { |
