diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-07-29 14:02:09 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-08-04 12:55:08 +0100 |
| commit | e96c3b81cadd0ba84d43b1f3a54980df3785d9a5 (patch) | |
| tree | d5c3febf7f1ab93958a800e778d63d1233ca7779 /libswscale/swscale_unscaled.c | |
| parent | e0d73fda361729d207e51fa2afd8ba6102e58d98 (diff) | |
| download | ffmpeg-e96c3b81cadd0ba84d43b1f3a54980df3785d9a5.tar.gz | |
avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8
The rationale is that you have a packed format in form
<greyscale sample> <alpha sample> <greyscale sample> <alpha sample>
and shortening greyscale to 'G' might make one thing about Greenscale instead.
An alias pixel format and color space name are provided for compatibility.
Diffstat (limited to 'libswscale/swscale_unscaled.c')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index a1ccc5ab76..21762a72ae 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -351,7 +351,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 == AV_PIX_FMT_Y400A) { + if (srcFormat == AV_PIX_FMT_YA8) { switch (dstFormat) { case AV_PIX_FMT_RGB32 : conv = gray8aToPacked32; break; case AV_PIX_FMT_BGR32 : conv = gray8aToPacked32; break; @@ -1204,7 +1204,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c, g = ((i >> 1) & 3) * 85; b = ( i & 1) * 255; } else if (c->srcFormat == AV_PIX_FMT_GRAY8 || - c->srcFormat == AV_PIX_FMT_Y400A) { + c->srcFormat == AV_PIX_FMT_YA8) { r = g = b = i; } else { assert(c->srcFormat == AV_PIX_FMT_BGR4_BYTE); |