summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-05 11:34:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-05 11:34:29 +0200
commit0aa095483d194c0cfe6acc6dd4c72e545312676e (patch)
tree67884d80009d760bcb0889ca410c3c4fee32e9db /libavcodec/mpeg12.c
parent057c5d2e1646ee9536edf514b41690c8ffeef6fc (diff)
parent6fee1b90ce3bf4fbdfde7016e0890057c9000487 (diff)
downloadffmpeg-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/mpeg12.c')
-rw-r--r--libavcodec/mpeg12.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 1099e17f3d..5369c051c2 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -28,6 +28,7 @@
#define UNCHECKED_BITSTREAM_READER 1
//#define DEBUG
+#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
#include "libavutil/timecode.h"
@@ -58,7 +59,7 @@ uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
init_2d_vlc_rl(&rl);\
}
-static void init_2d_vlc_rl(RLTable *rl)
+static av_cold void init_2d_vlc_rl(RLTable *rl)
{
int i;
@@ -91,7 +92,7 @@ static void init_2d_vlc_rl(RLTable *rl)
}
}
-void ff_mpeg12_common_init(MpegEncContext *s)
+av_cold void ff_mpeg12_common_init(MpegEncContext *s)
{
s->y_dc_scale_table =