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/mpeg4videoenc.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/mpeg4videoenc.c')
| -rw-r--r-- | libavcodec/mpeg4videoenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 566273554e..8454edd0dc 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "mpegvideo.h" @@ -1095,7 +1096,7 @@ void ff_mpeg4_encode_picture_header(MpegEncContext * s, int picture_number) } -static void init_uni_dc_tab(void) +static av_cold void init_uni_dc_tab(void) { int level, uni_code, uni_len; @@ -1147,7 +1148,9 @@ static void init_uni_dc_tab(void) } } -static void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){ +static av_cold void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab, + uint8_t *len_tab) +{ int slevel, run, last; av_assert0(MAX_LEVEL >= 64); |