Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 09:43:26 +0000 (11:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 09:43:26 +0000 (11:43 +0200)
commit15677e72399d12911128e7109a7e4101226f48d6
treee9542130a2999d049af7489c838f47c0a025a0d5
parentec0e0eb4c16f1ac1b0c0bb5fe34a34ebab0b3749
parente8c0defe1322f0ff281d9bc5eee91fa1b712b6aa
Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa'

* commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa':
  8bps: decode 24bit files correctly as rgb32 on bigendian

Conflicts:
libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/8bps.c