RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2014-03-26 20:58:03 +01:00
parent b01a2562ae fcf5fc4445
commit 179cf14832
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/mlpdec.c
View File

@ -40,7 +40,7 @@
#include "config.h"
/** 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_STATIC_SIZE 64
#else