virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

arm: asm decode_block_coeffs_internal is vp8 specific

Browse Source 
Unbreaks compilation on arm due to conflicting types for
'ff_decode_block_coeffs_armv6'.
This commit is contained in:
Janne Grunau 2014-04-04 10:11:06 +02:00
parent 287432430c
commit f37815b1d5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/vp8.h
View File

@ -26,7 +26,7 @@
#include "libavcodec/vp8.h" #include "libavcodec/vp8.h"
#if HAVE_ARMV6_EXTERNAL #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], int ff_decode_block_coeffs_armv6(VP56RangeCoder *rc, int16_t block[16],
uint8_t probs[8][3][NUM_DCT_TOKENS-1], uint8_t probs[8][3][NUM_DCT_TOKENS-1],
int i, uint8_t *token_prob, int16_t qmul[2]); int i, uint8_t *token_prob, int16_t qmul[2]);