Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Apr 2012 23:14:45 +0000 (01:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Apr 2012 23:14:45 +0000 (01:14 +0200)
* qatar/master:
  Unscaled Planar RGB -> RGB support in swscale.

Conflicts:
libswscale/swscale_unscaled.c

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

Simple merge
@@@ -888,16 -899,8 +904,16 @@@ void ff_get_unscaled_swscale(SwsContex
          && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT))))
          c->swScale= rgbToRgbWrapper;
  
 -    if (isPlanarRGB(srcFormat) && isPackedRGB(dstFormat))
 +#define isByteRGB(f) (\
 +        f == PIX_FMT_RGB32   ||\
 +        f == PIX_FMT_RGB32_1 ||\
 +        f == PIX_FMT_RGB24   ||\
 +        f == PIX_FMT_BGR32   ||\
 +        f == PIX_FMT_BGR32_1 ||\
 +        f == PIX_FMT_BGR24)
 +
 +    if (isAnyRGB(srcFormat) && isPlanar(srcFormat) && isByteRGB(dstFormat))
-         c->swScale= planarRgbToRgbWrapper;
+         c->swScale = planarRgbToRgbWrapper;
  
      /* bswap 16 bits per pixel/component packed formats */
      if (IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, PIX_FMT_BGR444) ||