diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 21:17:52 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 21:17:52 +0200 |
commit | 4480edcf312b8d4350201eca047ccdd2c27f8517 (patch) | |
tree | dbca26f831a32c9638f0aab77daaee0eda3caf86 /libavcodec/fmtconvert.h | |
parent | 6cecb8915aa8fa8b55f494f9dd05cce1a4c36093 (diff) | |
parent | 91dffb4c1dfc7232e74ab86536afe39a777fc12d (diff) | |
download | ffmpeg-streaming-4480edcf312b8d4350201eca047ccdd2c27f8517.zip ffmpeg-streaming-4480edcf312b8d4350201eca047ccdd2c27f8517.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
w32threads: Make pthread_cond_wait follow POSIX
cosmetics: Consistently place static, inline and av_cold attributes/keywords.
sbrdsp: Use standard multiple inclusion guards.
pcm: K&R formatting cosmetics
rawdec: Support fourccs YV16 and YV24
rtmp: implement bandwidth notification
rtmp: update supported audio codecs value
Conflicts:
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fmtconvert.h')
-rw-r--r-- | libavcodec/fmtconvert.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h index c058475..a9fbb31 100644 --- a/libavcodec/fmtconvert.h +++ b/libavcodec/fmtconvert.h @@ -87,7 +87,7 @@ typedef struct FmtConvertContext { void ff_float_interleave_c(float *dst, const float **src, unsigned int len, int channels); -void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx); +av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx); |