diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-17 20:42:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-17 20:42:10 +0200 |
| commit | f9cd317223cb2c7be41c1c0ae2fdc31976247547 (patch) | |
| tree | 05c6c4351e3c08742278047f9f361bf4d6982269 /libavcodec | |
| parent | a50c6f99b44e014ee13fedac88f6a1835ade477a (diff) | |
| parent | fe4d5fe9361162f9033ff1bd84bfc1b2091ba785 (diff) | |
| download | ffmpeg-f9cd317223cb2c7be41c1c0ae2fdc31976247547.tar.gz | |
Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'
* commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785':
jpeg2000: Mark static data init functions as av_cold
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000.c | 3 | ||||
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 3 | ||||
| -rw-r--r-- | libavcodec/mqc.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 3762a9bb4b..200bb6d355 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -25,6 +25,7 @@ * JPEG 2000 image encoder and decoder common functions */ +#include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/mem.h" @@ -153,7 +154,7 @@ static int getsgnctxno(int flag, uint8_t *xorbit) return ctxlbltab[hcontrib][vcontrib]; } -void ff_jpeg2000_init_tier1_luts(void) +void av_cold ff_jpeg2000_init_tier1_luts(void) { int i, j; for (i = 0; i < 256; i++) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index fbfb7d1e5f..d6204bbfc7 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -27,6 +27,7 @@ #include <inttypes.h> +#include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/opt.h" @@ -1691,7 +1692,7 @@ end: return ret; } -static void jpeg2000_init_static_data(AVCodec *codec) +static av_cold void jpeg2000_init_static_data(AVCodec *codec) { ff_jpeg2000_init_tier1_luts(); ff_mqc_init_context_tables(); diff --git a/libavcodec/mqc.c b/libavcodec/mqc.c index f8294cd54c..f2d1e3b838 100644 --- a/libavcodec/mqc.c +++ b/libavcodec/mqc.c @@ -28,6 +28,8 @@ #include <string.h> #include <stdint.h> +#include "libavutil/attributes.h" + #include "mqc.h" /* MQ coder context state structure */ @@ -92,7 +94,7 @@ uint16_t ff_mqc_qe [2 * 47]; uint8_t ff_mqc_nlps[2 * 47]; uint8_t ff_mqc_nmps[2 * 47]; -void ff_mqc_init_context_tables(void) +void av_cold ff_mqc_init_context_tables(void) { int i; for (i = 0; i < 47; i++) { |