Merge commit 'fcf5fc44'

* commit 'fcf5fc44':
  truehd: tune VLC decoding for ARM.

Conflicts:
	libavcodec/mlpdec.c

See: e555e1bcMerged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/mlpdec.c

@@ -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