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 /libavutil/pixdesc.c | |
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 'libavutil/pixdesc.c')
-rw-r--r-- | libavutil/pixdesc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 3fb7e2ade5..5deafb5115 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1550,14 +1550,15 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_h = 1, .flags = AV_PIX_FMT_FLAG_HWACCEL, }, - [AV_PIX_FMT_GRAY8A] = { - .name = "gray8a", + [AV_PIX_FMT_YA8] = { + .name = "ya8", .nb_components = 2, .comp = { { 0, 1, 1, 0, 7 }, /* Y */ { 0, 1, 2, 0, 7 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_ALPHA, + .alias = "gray8a", }, [AV_PIX_FMT_GBRP] = { .name = "gbrp", |