diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 23:48:00 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 23:48:00 +0400 |
| commit | 4c8bc6fdee95af4cd7a8409dec34756350078b5e (patch) | |
| tree | 06e2f17f1cf3a77a0ec5c0c4ba4e91bf90b52710 /libswscale/swscale_internal.h | |
| parent | 0b25261d29c6b348e2dccc2985090cf10a60c34f (diff) | |
| parent | e96c3b81cadd0ba84d43b1f3a54980df3785d9a5 (diff) | |
Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'
* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5':
avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/raw.c
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 557b0ae522..cf7b955bac 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -670,7 +670,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 @@ -775,7 +775,7 @@ static av_always_inline int isALPHA(enum AVPixelFormat pix_fmt) || (x)==AV_PIX_FMT_YUYV422 \ || (x)==AV_PIX_FMT_YVYU422 \ || (x)==AV_PIX_FMT_UYVY422 \ - || (x)==AV_PIX_FMT_Y400A \ + || (x)==AV_PIX_FMT_YA8 \ || isRGBinInt(x) \ || isBGRinInt(x) \ ) |