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_internal.h | |
| 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_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 7ecf222e7f..4aef9617dd 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -606,7 +606,7 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt) #else #define isGray(x) \ ((x) == AV_PIX_FMT_GRAY8 || \ - (x) == AV_PIX_FMT_Y400A || \ + (x) == AV_PIX_FMT_YA8 || \ (x) == AV_PIX_FMT_GRAY16BE || \ (x) == AV_PIX_FMT_GRAY16LE) #endif @@ -697,7 +697,7 @@ static av_always_inline int usePal(enum AVPixelFormat pix_fmt) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); return ((desc->flags & AV_PIX_FMT_FLAG_PAL) || (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) || - pix_fmt == AV_PIX_FMT_Y400A); + pix_fmt == AV_PIX_FMT_YA8); } extern const uint64_t ff_dither4[2]; |