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/utils.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 'libswscale/utils.c')
-rw-r--r-- | libswscale/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 851965091a..22965310da 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -161,7 +161,7 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_RGB444BE] = { 1, 1 }, [AV_PIX_FMT_BGR444LE] = { 1, 1 }, [AV_PIX_FMT_BGR444BE] = { 1, 1 }, - [AV_PIX_FMT_Y400A] = { 1, 0 }, + [AV_PIX_FMT_YA8] = { 1, 0 }, [AV_PIX_FMT_BGR48BE] = { 1, 1 }, [AV_PIX_FMT_BGR48LE] = { 1, 1 }, [AV_PIX_FMT_BGRA64BE] = { 1, 1, 1 }, |