Merge remote-tracking branch 'richardpl/sws'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jan 2012 22:12:21 +0000 (23:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jan 2012 22:12:24 +0000 (23:12 +0100)
* richardpl/sws:
  rgb2rgb: remove unused bgr8torgb8()
  rgb2rgb: rgb12tobgr12()
  rgb2rgb: allow conversion for <15 bpp
  bmpenc: support for PIX_FMT_RGB444
  bmpdec: support for rgb444 with bitfields compression

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

Trivial merge