diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-07-29 14:02:09 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-08-04 12:55:08 +0100 |
| commit | e96c3b81cadd0ba84d43b1f3a54980df3785d9a5 (patch) | |
| tree | d5c3febf7f1ab93958a800e778d63d1233ca7779 /libavcodec | |
| parent | e0d73fda361729d207e51fa2afd8ba6102e58d98 (diff) | |
| download | ffmpeg-e96c3b81cadd0ba84d43b1f3a54980df3785d9a5.tar.gz | |
avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8
The rationale is that you have a packed format in form
<greyscale sample> <alpha sample> <greyscale sample> <alpha sample>
and shortening greyscale to 'G' might make one thing about Greenscale instead.
An alias pixel format and color space name are provided for compatibility.
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 0c08f8d46c..25aebed7d7 100644 --- a/libavcodec/brenderpix.c +++ b/libavcodec/brenderpix.c @@ -193,7 +193,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 f279b33374..c7697a5e87 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -45,7 +45,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_Y400A, \ +#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, \ diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index e98d5502bb..2c2109f076 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -90,7 +90,7 @@ static opj_image_t *libopenjpeg_create_image(AVCodecContext *avctx, switch (avctx->pix_fmt) { case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_GRAY16: - case AV_PIX_FMT_Y400A: + case AV_PIX_FMT_YA8: color_space = CLRSPC_GRAY; break; case AV_PIX_FMT_RGB24: @@ -302,7 +302,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_Y400A: + case AV_PIX_FMT_YA8: libopenjpeg_copy_packed8(avctx, frame, image); break; case AV_PIX_FMT_RGB48: @@ -424,7 +424,7 @@ AVCodec ff_libopenjpeg_encoder = { .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64, - AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_Y400A, + AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_YA8, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index bbe42230db..7bc2ad4847 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -499,7 +499,7 @@ static int decode_frame(AVCodecContext *avctx, avctx->pix_fmt = AV_PIX_FMT_PAL8; } 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 { goto fail; } diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 547ac442f1..541ef7aa3a 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -127,7 +127,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUV444P16LE, MKTAG('Y', '3', 0 , 16 ) }, { AV_PIX_FMT_YUV444P16BE, MKTAG(16 , 0 , '3', 'Y') }, { AV_PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) }, - { AV_PIX_FMT_Y400A, 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') }, |