diff options
Diffstat (limited to 'libavcodec/pngenc.c')
| -rw-r--r-- | libavcodec/pngenc.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 0d00a0866c..87d18d491a 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -235,43 +235,43 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, is_progressive = !!(avctx->flags & CODEC_FLAG_INTERLACED_DCT); switch(avctx->pix_fmt) { - case PIX_FMT_RGBA64BE: + case AV_PIX_FMT_RGBA64BE: bit_depth = 16; color_type = PNG_COLOR_TYPE_RGB_ALPHA; break; - case PIX_FMT_RGB48BE: + case AV_PIX_FMT_RGB48BE: bit_depth = 16; color_type = PNG_COLOR_TYPE_RGB; break; - case PIX_FMT_RGBA: + case AV_PIX_FMT_RGBA: avctx->bits_per_coded_sample = 32; bit_depth = 8; color_type = PNG_COLOR_TYPE_RGB_ALPHA; break; - case PIX_FMT_RGB24: + case AV_PIX_FMT_RGB24: avctx->bits_per_coded_sample = 24; bit_depth = 8; color_type = PNG_COLOR_TYPE_RGB; break; - case PIX_FMT_GRAY16BE: + case AV_PIX_FMT_GRAY16BE: bit_depth = 16; color_type = PNG_COLOR_TYPE_GRAY; break; - case PIX_FMT_GRAY8: + case AV_PIX_FMT_GRAY8: avctx->bits_per_coded_sample = 0x28; bit_depth = 8; color_type = PNG_COLOR_TYPE_GRAY; break; - case PIX_FMT_GRAY8A: + case AV_PIX_FMT_GRAY8A: bit_depth = 8; color_type = PNG_COLOR_TYPE_GRAY_ALPHA; break; - case PIX_FMT_MONOBLACK: + case AV_PIX_FMT_MONOBLACK: avctx->bits_per_coded_sample = bit_depth = 1; color_type = PNG_COLOR_TYPE_GRAY; break; - case PIX_FMT_PAL8: + case AV_PIX_FMT_PAL8: avctx->bits_per_coded_sample = bit_depth = 8; color_type = PNG_COLOR_TYPE_PALETTE; @@ -437,7 +437,7 @@ static av_cold int png_enc_init(AVCodecContext *avctx){ ff_dsputil_init(&s->dsp, avctx); s->filter_type = av_clip(avctx->prediction_method, PNG_FILTER_VALUE_NONE, PNG_FILTER_VALUE_MIXED); - if(avctx->pix_fmt == PIX_FMT_MONOBLACK) + if(avctx->pix_fmt == AV_PIX_FMT_MONOBLACK) s->filter_type = PNG_FILTER_VALUE_NONE; return 0; @@ -451,13 +451,13 @@ AVCodec ff_png_encoder = { .init = png_enc_init, .encode2 = encode_frame, .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, - .pix_fmts = (const enum PixelFormat[]){ - PIX_FMT_RGB24, PIX_FMT_RGBA, - PIX_FMT_RGB48BE, PIX_FMT_RGBA64BE, - PIX_FMT_PAL8, - PIX_FMT_GRAY8, PIX_FMT_GRAY8A, - PIX_FMT_GRAY16BE, - PIX_FMT_MONOBLACK, PIX_FMT_NONE + .pix_fmts = (const enum AVPixelFormat[]){ + AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, + AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGBA64BE, + AV_PIX_FMT_PAL8, + AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, + AV_PIX_FMT_GRAY16BE, + AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), }; |