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/wmadec.c | |
| parent | 057c5d2e1646ee9536edf514b41690c8ffeef6fc (diff) | |
| parent | 6fee1b90ce3bf4fbdfde7016e0890057c9000487 (diff) | |
| download | ffmpeg-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/wmadec.c')
| -rw-r--r-- | libavcodec/wmadec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 0648c1e505..d46eb33c41 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -33,6 +33,7 @@ * should be 4 extra bytes for v1 data and 6 extra bytes for v2 data. */ +#include "libavutil/attributes.h" #include "avcodec.h" #include "internal.h" #include "wma.h" @@ -66,7 +67,7 @@ static void dump_floats(WMACodecContext *s, const char *name, int prec, const fl } #endif -static int wma_decode_init(AVCodecContext * avctx) +static av_cold int wma_decode_init(AVCodecContext * avctx) { WMACodecContext *s = avctx->priv_data; int i, flags2; @@ -150,7 +151,7 @@ static inline float pow_m1_4(WMACodecContext *s, float x) return s->lsp_pow_e_table[e] * (a + b * t.f); } -static void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len) +static av_cold void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len) { float wdel, a, b; int i, e, m; |