diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-04-27 21:36:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 21:36:30 +0200 |
| commit | e91946ed23dfbb9a6341266020ed8475ec15697d (patch) | |
| tree | d30938a1e4b7b2cf903ed0211d37fc333d323449 /libswscale/swscale.c | |
| parent | 52a81cd0e413eb54f8d96a79d84f588fe01cc0cc (diff) | |
| download | ffmpeg-e91946ed23dfbb9a6341266020ed8475ec15697d.tar.gz | |
Rename y400a to gray8a.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index bf41180a62..51882e4035 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -80,7 +80,7 @@ untested special converters (x)==PIX_FMT_PAL8 \ || (x)==PIX_FMT_YUYV422 \ || (x)==PIX_FMT_UYVY422 \ - || (x)==PIX_FMT_Y400A \ + || (x)==PIX_FMT_GRAY8A \ || isAnyRGB(x) \ ) @@ -1528,7 +1528,7 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY; const uint8_t *srcPtr= src[0]; - if (srcFormat == PIX_FMT_Y400A) { + if (srcFormat == PIX_FMT_GRAY8A) { switch (dstFormat) { case PIX_FMT_RGB32 : conv = gray8aToPacked32; break; case PIX_FMT_BGR32 : conv = gray8aToPacked32; break; @@ -2017,7 +2017,7 @@ int sws_scale(SwsContext *c, const uint8_t* const src[], const int srcStride[], r= (i>>3 )*255; g= ((i>>1)&3)*85; b= (i&1 )*255; - } else if(c->srcFormat == PIX_FMT_GRAY8 || c->srcFormat == PIX_FMT_Y400A) { + } else if(c->srcFormat == PIX_FMT_GRAY8 || c->srcFormat == PIX_FMT_GRAY8A) { r = g = b = i; } else { assert(c->srcFormat == PIX_FMT_BGR4_BYTE); |