Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:03:20 +0000 (03:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:03:20 +0000 (03:03 +0200)
commit3974889614e04f700637b564df737c180d8583ea
tree7dc5805927d14c1e6900aa9ac97ab9c53b7cb20c
parent2e13a45b1a9a69456631e582bbb06954d169eb55
parente2bd03a14a4e3366df0b1ee8e284a97165be1f3c
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@gmx.at>
tests/fate/image.mak
tests/fate/video.mak