diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:48:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:48:00 +0200 |
| commit | 4c8bc6fdee95af4cd7a8409dec34756350078b5e (patch) | |
| tree | 06e2f17f1cf3a77a0ec5c0c4ba4e91bf90b52710 /libavcodec/raw.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 'libavcodec/raw.c')
| -rw-r--r-- | libavcodec/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 551a1722fc..56c4a6b118 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -146,7 +146,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) }, { AV_PIX_FMT_YUVA422P, MKTAG('Y', '4', 10 , 8 ) }, { AV_PIX_FMT_YUVA444P, MKTAG('Y', '4', 0 , 8 ) }, - { AV_PIX_FMT_GRAY8A, MKTAG('Y', '2', 0 , 8 ) }, + { AV_PIX_FMT_YA8, MKTAG('Y', '2', 0 , 8 ) }, { AV_PIX_FMT_YUVA420P9LE, MKTAG('Y', '4', 11 , 9 ) }, { AV_PIX_FMT_YUVA420P9BE, MKTAG( 9 , 11 , '4', 'Y') }, |