* 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
Showing the changes to libavcodec (5 of 15 files). Show all
Unified · Split
| @@ -197,7 +197,7 @@ static int pix_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, · 196 unmodified lines | ||
| 197 | 197 | bytes_pp = 4; |
| 198 | 198 | break; |
| 199 | 199 | case 18: |
| 200 | − avctx->pix_fmt = AV_PIX_FMT_Y400A; | |
| 200 | + avctx->pix_fmt = AV_PIX_FMT_YA8; | |
| 201 | 201 | bytes_pp = 2; |
| 202 | 202 | break; |
| 203 | 203 | default: |
| @@ -50,7 +50,7 @@ · 49 unmodified lines | ||
| 50 | 50 | #define RGB_PIXEL_FORMATS AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, \ |
| 51 | 51 | AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64 |
| 52 | 52 | |
| 53 | −#define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, \ | |
| 53 | +#define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, \ | |
| 54 | 54 | AV_PIX_FMT_GRAY16 |
| 55 | 55 | |
| 56 | 56 | #define YUV_PIXEL_FORMATS AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUVA420P, \ |
| @@ -93,7 +93,7 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p · 92 unmodified lines | ||
| 93 | 93 | |
| 94 | 94 | switch (avctx->pix_fmt) { |
| 95 | 95 | case AV_PIX_FMT_GRAY8: |
| 96 | − case AV_PIX_FMT_GRAY8A: | |
| 96 | + case AV_PIX_FMT_YA8: | |
| 97 | 97 | case AV_PIX_FMT_GRAY16: |
| 98 | 98 | color_space = CLRSPC_GRAY; |
| 99 | 99 | break; |
| @@ -484,7 +484,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 384 unmodified lines | ||
| 484 | 484 | switch (avctx->pix_fmt) { |
| 485 | 485 | case AV_PIX_FMT_RGB24: |
| 486 | 486 | case AV_PIX_FMT_RGBA: |
| 487 | − case AV_PIX_FMT_GRAY8A: | |
| 487 | + case AV_PIX_FMT_YA8: | |
| 488 | 488 | cpyresult = libopenjpeg_copy_packed8(avctx, frame, image); |
| 489 | 489 | break; |
| 490 | 490 | case AV_PIX_FMT_XYZ12: |
| @@ -650,7 +650,7 @@ AVCodec ff_libopenjpeg_encoder = { · 159 unmodified lines | ||
| 650 | 650 | AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48, |
| 651 | 651 | AV_PIX_FMT_RGBA64, AV_PIX_FMT_GBR24P, |
| 652 | 652 | AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, |
| 653 | − AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, AV_PIX_FMT_GRAY16, | |
| 653 | + AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, AV_PIX_FMT_GRAY16, | |
| 654 | 654 | AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P, |
| 655 | 655 | AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVA422P, |
| 656 | 656 | AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA444P, |
| @@ -654,7 +654,7 @@ static int decode_frame(AVCodecContext *avctx, · 653 unmodified lines | ||
| 654 | 654 | avctx->pix_fmt = AV_PIX_FMT_MONOBLACK; |
| 655 | 655 | } else if (s->bit_depth == 8 && |
| 656 | 656 | s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { |
| 657 | − avctx->pix_fmt = AV_PIX_FMT_Y400A; | |
| 657 | + avctx->pix_fmt = AV_PIX_FMT_YA8; | |
| 658 | 658 | } else { |
| 659 | 659 | av_log(avctx, AV_LOG_ERROR, "unsupported bit depth %d " |
| 660 | 660 | "and color type %d\n", |
| @@ -146,7 +146,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { · 145 unmodified lines | ||
| 146 | 146 | { AV_PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) }, |
| 147 | 147 | { AV_PIX_FMT_YUVA422P, MKTAG('Y', '4', 10 , 8 ) }, |
| 148 | 148 | { AV_PIX_FMT_YUVA444P, MKTAG('Y', '4', 0 , 8 ) }, |
| 149 | − { AV_PIX_FMT_GRAY8A, MKTAG('Y', '2', 0 , 8 ) }, | |
| 149 | + { AV_PIX_FMT_YA8, MKTAG('Y', '2', 0 , 8 ) }, | |
| 150 | 150 | |
| 151 | 151 | { AV_PIX_FMT_YUVA420P9LE, MKTAG('Y', '4', 11 , 9 ) }, |
| 152 | 152 | { AV_PIX_FMT_YUVA420P9BE, MKTAG( 9 , 11 , '4', 'Y') }, |