diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-04-27 21:36:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 21:36:30 +0200 |
| commit | e91946ed23dfbb9a6341266020ed8475ec15697d (patch) | |
| tree | d30938a1e4b7b2cf903ed0211d37fc333d323449 /libavcodec | |
| parent | 52a81cd0e413eb54f8d96a79d84f588fe01cc0cc (diff) | |
| download | ffmpeg-e91946ed23dfbb9a6341266020ed8475ec15697d.tar.gz | |
Rename y400a to gray8a.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pngdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/raw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 17fea6815b..3b31109671 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -473,7 +473,7 @@ static int decode_frame(AVCodecContext *avctx, } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) { avctx->pix_fmt = PIX_FMT_PAL8; } else if (s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { - avctx->pix_fmt = PIX_FMT_Y400A; + avctx->pix_fmt = PIX_FMT_GRAY8A; } else { goto fail; } diff --git a/libavcodec/raw.c b/libavcodec/raw.c index e607148a2b..0a865f470a 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -114,7 +114,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_YUV444P16LE, MKTAG('Y', '3', 0 , 16 ) }, { PIX_FMT_YUV444P16BE, MKTAG(16 , 0 , '3', 'Y') }, { PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) }, - { PIX_FMT_Y400A, MKTAG('Y', '2', 0 , 8 ) }, + { PIX_FMT_GRAY8A, MKTAG('Y', '2', 0 , 8 ) }, /* quicktime */ { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') }, |