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)
* commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608':
  sws: use planarRgbToRgbWrapper only for 8bit per component

Conflicts:
libswscale/swscale_unscaled.c

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

Simple merge