diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-10-06 12:10:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-10-08 07:13:26 +0200 |
| commit | 716d413c13981da15323c7a3821860536eefdbbb (patch) | |
| tree | b15ebcded50b8edaa5b9fc8f261774043138e1fa /libavcodec/pngdec.c | |
| parent | 78071a1420b425dfb787ac739048f523007b8139 (diff) | |
| download | ffmpeg-716d413c13981da15323c7a3821860536eefdbbb.tar.gz | |
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
Diffstat (limited to 'libavcodec/pngdec.c')
| -rw-r--r-- | libavcodec/pngdec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index da63c5f28c..aaedeff187 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -463,28 +463,28 @@ static int decode_frame(AVCodecContext *avctx, if (s->bit_depth == 8 && s->color_type == PNG_COLOR_TYPE_RGB) { - avctx->pix_fmt = PIX_FMT_RGB24; + avctx->pix_fmt = AV_PIX_FMT_RGB24; } else if (s->bit_depth == 8 && s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) { - avctx->pix_fmt = PIX_FMT_RGB32; + avctx->pix_fmt = AV_PIX_FMT_RGB32; } else if (s->bit_depth == 8 && s->color_type == PNG_COLOR_TYPE_GRAY) { - avctx->pix_fmt = PIX_FMT_GRAY8; + avctx->pix_fmt = AV_PIX_FMT_GRAY8; } else if (s->bit_depth == 16 && s->color_type == PNG_COLOR_TYPE_GRAY) { - avctx->pix_fmt = PIX_FMT_GRAY16BE; + avctx->pix_fmt = AV_PIX_FMT_GRAY16BE; } else if (s->bit_depth == 16 && s->color_type == PNG_COLOR_TYPE_RGB) { - avctx->pix_fmt = PIX_FMT_RGB48BE; + avctx->pix_fmt = AV_PIX_FMT_RGB48BE; } else if (s->bit_depth == 1 && s->color_type == PNG_COLOR_TYPE_GRAY) { - avctx->pix_fmt = PIX_FMT_MONOBLACK; + avctx->pix_fmt = AV_PIX_FMT_MONOBLACK; } else if (s->bit_depth == 8 && s->color_type == PNG_COLOR_TYPE_PALETTE) { - avctx->pix_fmt = PIX_FMT_PAL8; + avctx->pix_fmt = AV_PIX_FMT_PAL8; } else if (s->bit_depth == 8 && s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { - avctx->pix_fmt = PIX_FMT_Y400A; + avctx->pix_fmt = AV_PIX_FMT_Y400A; } else { goto fail; } |