[FFmpeg-cvslog] Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 19 23:26:55 2013 +0200| [e07e8882ae92b3328ca3ae97b494e5c2158256dd] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e07e8882ae92b3328ca3ae97b494e5c2158256dd
---