diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2014-04-04 10:11:06 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2014-04-04 10:39:29 +0200 |
| commit | f37815b1d5ee85d266ad27214a71831707111aa8 (patch) | |
| tree | 97dbf6ae33d30260fbcc9700acc5f952ade2cea5 | |
| parent | 287432430c5c9cb8ffe1da1376949de494f24e45 (diff) | |
| download | ffmpeg-f37815b1d5ee85d266ad27214a71831707111aa8.tar.gz | |
arm: asm decode_block_coeffs_internal is vp8 specific
Unbreaks compilation on arm due to conflicting types for
'ff_decode_block_coeffs_armv6'.
| -rw-r--r-- | libavcodec/arm/vp8.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/vp8.h b/libavcodec/arm/vp8.h index cd3428bea2..93b2788835 100644 --- a/libavcodec/arm/vp8.h +++ b/libavcodec/arm/vp8.h @@ -26,7 +26,7 @@ #include "libavcodec/vp8.h" #if HAVE_ARMV6_EXTERNAL -#define decode_block_coeffs_internal ff_decode_block_coeffs_armv6 +#define vp8_decode_block_coeffs_internal ff_decode_block_coeffs_armv6 int ff_decode_block_coeffs_armv6(VP56RangeCoder *rc, int16_t block[16], uint8_t probs[8][3][NUM_DCT_TOKENS-1], int i, uint8_t *token_prob, int16_t qmul[2]); |