Merge commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 03:41:16 +0000 (04:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 03:44:25 +0000 (04:44 +0100)
commit8a8472dd49d720f8c5bbe54cad17651542af7d81
tree46f0b63bd1c9d5bd3970920226c12accc45845fb
parent16ddc58bd7a2f98b47fb2597a2b349d0aba82da4
parenta7a5e3850ecd94e726ad2272295b9e6c91841cf8
Merge commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8'

* commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8':
  fate: add PAF audio and video tests

Conflicts:
tests/fate/audio.mak
tests/fate/video.mak

See: 101615c7ff37afe5e6a951838cbbbb92b7485473
See: 409cc4588329633326b32a5245b085c543689471
Merged-by: Michael Niedermayer <michaelni@gmx.at>