[FFmpeg-cvslog] Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 10 10:58:44 2015 +0100| [14ab6f9a268a5f0039f0eb4b8ed91c3652d4d0a7] | committer: Michael Niedermayer

Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'

* commit '96a06dbaf278e8152487e08772946f63bd2a3843':
  FATE: add support for testing hwaccels

Conflicts:
	tests/Makefile
	tests/fate-run.sh

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

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