* 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
Showing the changes to libavcodec/arm (3 of 18 files). Show all
Unified · Split
| @@ -25,7 +25,7 @@ · 24 unmodified lines | |||
| 25 | void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs, | 25 | void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs, |
| 26 | int decifactor, float scale); | 26 | int decifactor, float scale); |
| 27 | 27 | ||
| 28 | void av_cold ff_dcadsp_init_arm(DCADSPContext *s) | 28 | av_cold void ff_dcadsp_init_arm(DCADSPContext *s) |
| 29 | { | 29 | { |
| 30 | if (HAVE_NEON) | 30 | if (HAVE_NEON) |
| 31 | s->lfe_fir = ff_dca_lfe_fir_neon; | 31 | s->lfe_fir = ff_dca_lfe_fir_neon; |
| @@ -27,7 +27,7 @@ void ff_simple_idct_add_armv5te(uint8_t *dest, int line_size, DCTELEM *data); · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | void ff_prefetch_arm(void *mem, int stride, int h); | 28 | void ff_prefetch_arm(void *mem, int stride, int h); |
| 29 | 29 | ||
| 30 | void av_cold ff_dsputil_init_armv5te(DSPContext* c, AVCodecContext *avctx) | 30 | av_cold void ff_dsputil_init_armv5te(DSPContext *c, AVCodecContext *avctx) |
| 31 | { | 31 | { |
| 32 | if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 && | 32 | if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 && |
| 33 | (avctx->idct_algo == FF_IDCT_AUTO || | 33 | (avctx->idct_algo == FF_IDCT_AUTO || |
| @@ -70,7 +70,7 @@ int ff_sse16_armv6(void *s, uint8_t *blk1, uint8_t *blk2, · 69 unmodified lines | |||
| 70 | int ff_pix_norm1_armv6(uint8_t *pix, int line_size); | 70 | int ff_pix_norm1_armv6(uint8_t *pix, int line_size); |
| 71 | int ff_pix_sum_armv6(uint8_t *pix, int line_size); | 71 | int ff_pix_sum_armv6(uint8_t *pix, int line_size); |
| 72 | 72 | ||
| 73 | void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx) | 73 | av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx) |
| 74 | { | 74 | { |
| 75 | const int high_bit_depth = avctx->bits_per_raw_sample > 8; | 75 | const int high_bit_depth = avctx->bits_per_raw_sample > 8; |
| 76 | 76 | ||