[FFmpeg-cvslog] Merge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 14:00:15 2013 +0100| [8823ec4f9e92ed705bc1d6643b013c9fb8d46168] | committer: Michael Niedermayer

Merge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'

* commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a':
  FATE: add a test for the setpts filter
  FATE: add a test for the hqdn3d filter
  FATE: add a test for the transpose filter
  FATE: add a test for the unsharp filter

Conflicts:
	tests/ref/fate/filter-hqdn3d

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

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