diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 21:22:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 21:23:09 +0100 |
commit | 50b68e323c41207a3a69532c89a7675154986c3b (patch) | |
tree | d6508b51e7dd7a35a008615c3d1c52a9d7c953d5 /libavformat/nuv.c | |
parent | fc64e128f00893d90014b1c97e6846a14ec53dad (diff) | |
parent | 3b5946bccef6cd219f01d22e542ca5c6de68a7be (diff) | |
download | ffmpeg-50b68e323c41207a3a69532c89a7675154986c3b.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
truehd: add hand-scheduled ARM asm version of ff_mlp_pack_output.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nuv.c')
0 files changed, 0 insertions, 0 deletions