[FFmpeg-cvslog] Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 03:03:20 2015 +0200| [3974889614e04f700637b564df737c180d8583ea] | committer: Michael Niedermayer

Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'

* commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c':
  fate: Avoid unnecessary pixel format conversions

Conflicts:
	tests/fate/image.mak
	tests/ref/fate/dds-ya

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

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