[FFmpeg-cvslog] Merge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 13:23:12 2013 +0100| [6f1a6a9f6ba0528ac5f77c181b715f9c3fa098e9] | committer: Michael Niedermayer

Merge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'

* commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497':
  FATE: add a test for the fade filter
  FATE: add a test for the drawbox filter
  FATE: add a test for the boxblur filter
  FATE: add a test for the gradfun filter

Conflicts:
	tests/fate/filter.mak
	tests/ref/fate/filter-gradfun

our gradfun test is renamed to gradfun-ubitux as its name conflicts and
it was requested to be kept. Feel free to rename, change, finetune ...

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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