Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608'

Browse Source 
* 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
parent 42431a557e e58013dd8f
commit d1d9b93e9a
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      libswscale/swscale_unscaled.c

14
libswscale/swscale_unscaled.c
Unescape View File

@ -960,15 +960,15 @@ void ff_get_unscaled_swscale(SwsContext *c)
&& (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)))) && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT))))
c->swScale= rgbToRgbWrapper; c->swScale= rgbToRgbWrapper;
#define isByteRGB(f) (\ #define isByteRGB(f) ( \
f == AV_PIX_FMT_RGB32 ||\ f == AV_PIX_FMT_RGB32 || \
f == AV_PIX_FMT_RGB32_1 ||\ f == AV_PIX_FMT_RGB32_1 || \
f == AV_PIX_FMT_RGB24 ||\ f == AV_PIX_FMT_RGB24 || \
f == AV_PIX_FMT_BGR32 ||\ f == AV_PIX_FMT_BGR32 || \
f == AV_PIX_FMT_BGR32_1 ||\ f == AV_PIX_FMT_BGR32_1 || \
f == AV_PIX_FMT_BGR24) 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; c->swScale = planarRgbToRgbWrapper;
/* bswap 16 bits per pixel/component packed formats */ /* bswap 16 bits per pixel/component packed formats */

Write Preview
Loading…
Cancel
Save