Merge commit 'fcf5fc444522d24caa9907225802817ae788f511'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 19:58:03 +0000 (20:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 19:58:03 +0000 (20:58 +0100)
* commit 'fcf5fc444522d24caa9907225802817ae788f511':
  truehd: tune VLC decoding for ARM.

Conflicts:
libavcodec/mlpdec.c

See: e555e1bc39ea71d46a07d0bb847fb426c2dd4d80
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mlpdec.c

Simple merge