Merge commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 23:58:13 +0000 (00:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 23:58:13 +0000 (00:58 +0100)
commitb7bfe17824b668bb5865024029cacaf083b2c1ce
tree3345e0e9fe85d3884da00bbfcd3c50c73df6c18e
parentcb416a7d795414aaa534c27943bda0d3aef3b5a1
parentd2f1d42b18787e4fcb28864d9d9f701dd64a5747
Merge commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747'

* commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747':
  fate: add dolby true hd tests

Conflicts:
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/lossless-audio.mak