Merge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 12:55:51 +0000 (13:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 12:55:51 +0000 (13:55 +0100)
commitd1d9b93e9a212c030ebde1993a88694e25feee7b
tree0982ad7e3061de604507a3049d597e0f44b008f0
parent42431a557e2df0289e725b518b0d7a3e1a4e39b3
parente58013dd8f00e17dd98ba64e41c72f1d152f6608
Merge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608'

* commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608':
  sws: use planarRgbToRgbWrapper only for 8bit per component

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/swscale_unscaled.c