Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 21:26:55 +0000 (23:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 21:26:55 +0000 (23:26 +0200)
commite07e8882ae92b3328ca3ae97b494e5c2158256dd
tree0f93b87aa0554d25b8b55bcbdb5aa3fb72f6aa6d
parent6c5989cce9e3ef93766a3c62096d4a08ee4be7c1
parenta77aed142cade3beb0cd43f879d4f47daae23b8a
Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'

* commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a':
  fate: Rename video filters file and add separate video filters target

Conflicts:
tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/Makefile
tests/fate/filter-video.mak