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/dvdsubdec.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/dvdsubdec.c')
| -rw-r--r-- | libavcodec/dvdsubdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 6cc40b761f..d94f420b92 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -21,6 +21,7 @@ #include "avcodec.h" #include "get_bits.h" #include "dsputil.h" +#include "libavutil/attributes.h" #include "libavutil/colorspace.h" #include "libavutil/opt.h" #include "libavutil/imgutils.h" @@ -565,7 +566,7 @@ static int dvdsub_parse_extradata(AVCodecContext *avctx) return 1; } -static int dvdsub_init(AVCodecContext *avctx) +static int av_cold dvdsub_init(AVCodecContext *avctx) { DVDSubContext *ctx = avctx->priv_data; int ret; |