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/arm | |
| parent | 6cecb8915aa8fa8b55f494f9dd05cce1a4c36093 (diff) | |
| parent | 91dffb4c1dfc7232e74ab86536afe39a777fc12d (diff) | |
| download | ffmpeg-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/arm')
| -rw-r--r-- | libavcodec/arm/dcadsp_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv5te.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/dcadsp_init_arm.c b/libavcodec/arm/dcadsp_init_arm.c index 5663cd7fc2..8b57ad3d05 100644 --- a/libavcodec/arm/dcadsp_init_arm.c +++ b/libavcodec/arm/dcadsp_init_arm.c @@ -25,7 +25,7 @@ void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs, int decifactor, float scale); -void av_cold ff_dcadsp_init_arm(DCADSPContext *s) +av_cold void ff_dcadsp_init_arm(DCADSPContext *s) { if (HAVE_NEON) s->lfe_fir = ff_dca_lfe_fir_neon; diff --git a/libavcodec/arm/dsputil_init_armv5te.c b/libavcodec/arm/dsputil_init_armv5te.c index 2390aabb62..9fedb7a123 100644 --- a/libavcodec/arm/dsputil_init_armv5te.c +++ b/libavcodec/arm/dsputil_init_armv5te.c @@ -27,7 +27,7 @@ void ff_simple_idct_add_armv5te(uint8_t *dest, int line_size, DCTELEM *data); void ff_prefetch_arm(void *mem, int stride, int h); -void av_cold ff_dsputil_init_armv5te(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_armv5te(DSPContext *c, AVCodecContext *avctx) { if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 && (avctx->idct_algo == FF_IDCT_AUTO || 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; |