aboutsummaryrefslogtreecommitdiffstats
path: root/INSTALL
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-09 08:53:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-09 08:58:59 +0200
commit760c5278dbff53a68949700b31a2b440f3aa231a (patch)
tree791efd68a827963ba87ac86f0d257e852d073bd8 /INSTALL
parent0dc17da30825c9bda5afef646ef3494fecce646a (diff)
parentfa09e76010b7db5ae0c7af9b7412096359ecd8c8 (diff)
downloadffmpeg-760c5278dbff53a68949700b31a2b440f3aa231a.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: FATE: add a TAK test Conflicts: tests/fate/lossless-audio.mak No change as we already have a tak test with luckynight-partial.tak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'INSTALL')
0 files changed, 0 insertions, 0 deletions