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>
This commit is contained in:
commit
8a8472dd49