RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2014-06-17 20:42:10 +02:00
parent a50c6f99b4 fe4d5fe936
commit f9cd317223
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/jpeg2000.c
View File

@ -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++)

3
libavcodec/jpeg2000dec.c
View File

@ -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();

4
libavcodec/mqc.c
View File

@ -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++) {