Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 00:07:00 +0000 (02:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 00:07:08 +0000 (02:07 +0200)
commit0f88a98b43b8ae41529a15c52b35b5d1bbef3197
tree0cd2a7731202a0cf3513ad606910eeefb9baa1db
parent175e916fa20b7887bdb29809817985e481ae0888
parent7800b09ece52490dda4c46fbd8e93f92e8438428
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()

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