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 | |
| parent | 0b25261d29c6b348e2dccc2985090cf10a60c34f (diff) | |
| parent | e96c3b81cadd0ba84d43b1f3a54980df3785d9a5 (diff) | |
| download | ffmpeg-4c8bc6fdee95af4cd7a8409dec34756350078b5e.tar.gz | |
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')
| -rw-r--r-- | libavcodec/brenderpix.c | 2 | ||||
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/libopenjpegenc.c | 6 | ||||
| -rw-r--r-- | libavcodec/pngdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/raw.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c index e0d033fcf9..02d922f8f5 100644 --- a/libavcodec/brenderpix.c +++ b/libavcodec/brenderpix.c @@ -197,7 +197,7 @@ static int pix_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, bytes_pp = 4; break; case 18: - avctx->pix_fmt = AV_PIX_FMT_Y400A; + avctx->pix_fmt = AV_PIX_FMT_YA8; bytes_pp = 2; break; default: diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 178e4488c4..0cf46e613d 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -50,7 +50,7 @@ #define RGB_PIXEL_FORMATS AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, \ AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64 -#define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, \ +#define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, \ AV_PIX_FMT_GRAY16 #define YUV_PIXEL_FORMATS AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUVA420P, \ diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 0fcc48ffdd..66633f4ad2 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -93,7 +93,7 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p switch (avctx->pix_fmt) { case AV_PIX_FMT_GRAY8: - case AV_PIX_FMT_GRAY8A: + case AV_PIX_FMT_YA8: case AV_PIX_FMT_GRAY16: color_space = CLRSPC_GRAY; break; @@ -484,7 +484,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, switch (avctx->pix_fmt) { case AV_PIX_FMT_RGB24: case AV_PIX_FMT_RGBA: - case AV_PIX_FMT_GRAY8A: + case AV_PIX_FMT_YA8: cpyresult = libopenjpeg_copy_packed8(avctx, frame, image); break; case AV_PIX_FMT_XYZ12: @@ -650,7 +650,7 @@ AVCodec ff_libopenjpeg_encoder = { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64, AV_PIX_FMT_GBR24P, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, - AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, AV_PIX_FMT_GRAY16, + AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA444P, diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index e46800ba7a..66a59ae8bd 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -654,7 +654,7 @@ static int decode_frame(AVCodecContext *avctx, avctx->pix_fmt = AV_PIX_FMT_MONOBLACK; } else if (s->bit_depth == 8 && s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { - avctx->pix_fmt = AV_PIX_FMT_Y400A; + avctx->pix_fmt = AV_PIX_FMT_YA8; } else { av_log(avctx, AV_LOG_ERROR, "unsupported bit depth %d " "and color type %d\n", 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') }, |