[FFmpeg-cvslog] Merge commit 'fcf5fc444522d24caa9907225802817ae788f511'
Michael Niedermayer
git at videolan.org
Wed Mar 26 21:05:39 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 20:58:03 2014 +0100| [179cf1483262c1adf9d70e71df3078c26fcc6f13] | committer: Michael Niedermayer
Merge commit 'fcf5fc444522d24caa9907225802817ae788f511'
* commit 'fcf5fc444522d24caa9907225802817ae788f511':
truehd: tune VLC decoding for ARM.
Conflicts:
libavcodec/mlpdec.c
See: e555e1bc39ea71d46a07d0bb847fb426c2dd4d80
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=179cf1483262c1adf9d70e71df3078c26fcc6f13
---
More information about the ffmpeg-cvslog
mailing list