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>
pull/9/merge
Michael Niedermayer 12 years ago
commit d1d9b93e9a
  1. 2
      libswscale/swscale_unscaled.c

@ -968,7 +968,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
f == AV_PIX_FMT_BGR32_1 || \
f == AV_PIX_FMT_BGR24)
if (srcFormat == AV_PIX_FMT_GBR24P && isPlanar(srcFormat) && isByteRGB(dstFormat))
if (srcFormat == AV_PIX_FMT_GBRP && isPlanar(srcFormat) && isByteRGB(dstFormat))
c->swScale = planarRgbToRgbWrapper;
/* bswap 16 bits per pixel/component packed formats */

Loading…
Cancel
Save