[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Thu Mar 27 02:05:11 CET 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 27 01:59:32 2014 +0100| [62094e2fddf53f608bc42f54ae50979ec8eb2b84] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add Alias PIX tests

Conflicts:
	tests/fate/image.mak

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

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