aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libschroedingerenc.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/libschroedingerenc.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/libschroedingerenc.c')
-rw-r--r--libavcodec/libschroedingerenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c
index 297c6c50c8..21af65e0df 100644
--- a/libavcodec/libschroedingerenc.c
+++ b/libavcodec/libschroedingerenc.c
@@ -31,6 +31,7 @@
#include <schroedinger/schrodebug.h>
#include <schroedinger/schrovideoformat.h>
+#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
#include "avcodec.h"
#include "internal.h"
@@ -100,7 +101,7 @@ static int set_chroma_format(AVCodecContext *avctx)
return -1;
}
-static int libschroedinger_encode_init(AVCodecContext *avctx)
+static av_cold int libschroedinger_encode_init(AVCodecContext *avctx)
{
SchroEncoderParams *p_schro_params = avctx->priv_data;
SchroVideoFormatEnum preset;