diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 13:34:29 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 13:34:29 +0400 |
| commit | 0aa095483d194c0cfe6acc6dd4c72e545312676e (patch) | |
| tree | 67884d80009d760bcb0889ca410c3c4fee32e9db /libavcodec/ituh263enc.c | |
| parent | 057c5d2e1646ee9536edf514b41690c8ffeef6fc (diff) | |
| parent | 6fee1b90ce3bf4fbdfde7016e0890057c9000487 (diff) | |
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/ituh263enc.c')
| -rw-r--r-- | libavcodec/ituh263enc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 9a03f02448..a17f63adbf 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -30,6 +30,7 @@ //#define DEBUG #include <limits.h> +#include "libavutil/attributes.h" #include "avcodec.h" #include "mpegvideo.h" #include "h263.h" @@ -679,7 +680,7 @@ void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code) } } -static void init_mv_penalty_and_fcode(MpegEncContext *s) +static av_cold void init_mv_penalty_and_fcode(MpegEncContext *s) { int f_code; int mv; @@ -721,7 +722,9 @@ static void init_mv_penalty_and_fcode(MpegEncContext *s) } } -static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){ +static av_cold void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, + uint8_t *len_tab) +{ int slevel, run, last; av_assert0(MAX_LEVEL >= 64); @@ -764,7 +767,7 @@ static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_t } } -void ff_h263_encode_init(MpegEncContext *s) +av_cold void ff_h263_encode_init(MpegEncContext *s) { static int done = 0; |