mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'fcf5fc444522d24caa9907225802817ae788f511'
* commit 'fcf5fc444522d24caa9907225802817ae788f511':
truehd: tune VLC decoding for ARM.
Conflicts:
libavcodec/mlpdec.c
See: e555e1bc39
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
179cf14832
|
@ -40,7 +40,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
/** number of bits used for VLC lookup - longest Huffman code is 9 */
|
/** number of bits used for VLC lookup - longest Huffman code is 9 */
|
||||||
#if ARCH_ARM == 1
|
#if ARCH_ARM
|
||||||
#define VLC_BITS 5
|
#define VLC_BITS 5
|
||||||
#define VLC_STATIC_SIZE 64
|
#define VLC_STATIC_SIZE 64
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue