Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 20:06:15 +0000 (21:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 20:07:08 +0000 (21:07 +0100)
commitc881f46a9c7e787df760bac64bf7807958885113
tree118f208f4d8813f0e897a4a5d64d0ee553639bce
parent396ddcf22d55fa7e735d69eed22a4a4b1649b73c
parentf8558780bbbbba05f4724772b27152f257cb7b05
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Explicitly specify the rgb555le pixel format for the mss2 rgb555 tests

See: 34e90b2e6d66c511bea872bcb3a0e34b482b8c17
Merged-by: Michael Niedermayer <michaelni@gmx.at>