diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 13:55:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 13:55:51 +0100 |
| commit | d1d9b93e9a212c030ebde1993a88694e25feee7b (patch) | |
| tree | 0982ad7e3061de604507a3049d597e0f44b008f0 /libswscale | |
| parent | 42431a557e2df0289e725b518b0d7a3e1a4e39b3 (diff) | |
| parent | e58013dd8f00e17dd98ba64e41c72f1d152f6608 (diff) | |
| download | ffmpeg-d1d9b93e9a212c030ebde1993a88694e25feee7b.tar.gz | |
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>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 55cda5dbd9..20c76d626a 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -960,15 +960,15 @@ void ff_get_unscaled_swscale(SwsContext *c) && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)))) c->swScale= rgbToRgbWrapper; -#define isByteRGB(f) (\ - f == AV_PIX_FMT_RGB32 ||\ - f == AV_PIX_FMT_RGB32_1 ||\ - f == AV_PIX_FMT_RGB24 ||\ - f == AV_PIX_FMT_BGR32 ||\ - f == AV_PIX_FMT_BGR32_1 ||\ +#define isByteRGB(f) ( \ + f == AV_PIX_FMT_RGB32 || \ + f == AV_PIX_FMT_RGB32_1 || \ + f == AV_PIX_FMT_RGB24 || \ + f == AV_PIX_FMT_BGR32 || \ + 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 */ |