diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 20:58:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 20:58:03 +0100 |
| commit | 179cf1483262c1adf9d70e71df3078c26fcc6f13 (patch) | |
| tree | 30228f08ceddfb142ae941f792d3de12564aa1bf /libavformat/ffmetadec.c | |
| parent | b01a2562ae3ff50198ba189c878023ee4ac34c72 (diff) | |
| parent | fcf5fc444522d24caa9907225802817ae788f511 (diff) | |
| download | ffmpeg-179cf1483262c1adf9d70e71df3078c26fcc6f13.tar.gz | |
Merge commit 'fcf5fc444522d24caa9907225802817ae788f511'
* commit 'fcf5fc444522d24caa9907225802817ae788f511':
truehd: tune VLC decoding for ARM.
Conflicts:
libavcodec/mlpdec.c
See: e555e1bc39ea71d46a07d0bb847fb426c2dd4d80
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmetadec.c')
0 files changed, 0 insertions, 0 deletions