diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 23:17:52 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 23:17:52 +0400 |
commit | 4480edcf312b8d4350201eca047ccdd2c27f8517 (patch) | |
tree | dbca26f831a32c9638f0aab77daaee0eda3caf86 /libavcodec/arm/dsputil_init_armv6.c | |
parent | 6cecb8915aa8fa8b55f494f9dd05cce1a4c36093 (diff) | |
parent | 91dffb4c1dfc7232e74ab86536afe39a777fc12d (diff) |
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/arm/dsputil_init_armv6.c')
-rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index fb0d00973e..cd5744d3b3 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -70,7 +70,7 @@ int ff_sse16_armv6(void *s, uint8_t *blk1, uint8_t *blk2, int ff_pix_norm1_armv6(uint8_t *pix, int line_size); int ff_pix_sum_armv6(uint8_t *pix, int line_size); -void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx) { const int high_bit_depth = avctx->bits_per_raw_sample > 8; |