From 716d413c13981da15323c7a3821860536eefdbbb Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 6 Oct 2012 12:10:34 +0200 Subject: Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat --- libavcodec/xwdenc.c | 102 ++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'libavcodec/xwdenc.c') diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index 8f56b1b646..a141e0839e 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -42,7 +42,7 @@ static av_cold int xwd_encode_init(AVCodecContext *avctx) static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *p, int *got_packet) { - enum PixelFormat pix_fmt = avctx->pix_fmt; + enum AVPixelFormat pix_fmt = avctx->pix_fmt; uint32_t pixdepth, bpp, bpad, ncolors = 0, lsize, vclass, be = 0; uint32_t rgb[3] = { 0 }, bitorder = 0; uint32_t header_size; @@ -53,15 +53,15 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (av_pix_fmt_descriptors[pix_fmt].flags & PIX_FMT_BE) be = 1; switch (pix_fmt) { - case PIX_FMT_ARGB: - case PIX_FMT_BGRA: - case PIX_FMT_RGBA: - case PIX_FMT_ABGR: - if (pix_fmt == PIX_FMT_ARGB || - pix_fmt == PIX_FMT_ABGR) + case AV_PIX_FMT_ARGB: + case AV_PIX_FMT_BGRA: + case AV_PIX_FMT_RGBA: + case AV_PIX_FMT_ABGR: + if (pix_fmt == AV_PIX_FMT_ARGB || + pix_fmt == AV_PIX_FMT_ABGR) be = 1; - if (pix_fmt == PIX_FMT_ABGR || - pix_fmt == PIX_FMT_RGBA) { + if (pix_fmt == AV_PIX_FMT_ABGR || + pix_fmt == AV_PIX_FMT_RGBA) { rgb[0] = 0xFF; rgb[1] = 0xFF00; rgb[2] = 0xFF0000; @@ -75,9 +75,9 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, vclass = XWD_TRUE_COLOR; bpad = 32; break; - case PIX_FMT_BGR24: - case PIX_FMT_RGB24: - if (pix_fmt == PIX_FMT_RGB24) + case AV_PIX_FMT_BGR24: + case AV_PIX_FMT_RGB24: + if (pix_fmt == AV_PIX_FMT_RGB24) be = 1; bpp = 24; vclass = XWD_TRUE_COLOR; @@ -86,12 +86,12 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, rgb[1] = 0xFF00; rgb[2] = 0xFF; break; - case PIX_FMT_RGB565LE: - case PIX_FMT_RGB565BE: - case PIX_FMT_BGR565LE: - case PIX_FMT_BGR565BE: - if (pix_fmt == PIX_FMT_BGR565LE || - pix_fmt == PIX_FMT_BGR565BE) { + case AV_PIX_FMT_RGB565LE: + case AV_PIX_FMT_RGB565BE: + case AV_PIX_FMT_BGR565LE: + case AV_PIX_FMT_BGR565BE: + if (pix_fmt == AV_PIX_FMT_BGR565LE || + pix_fmt == AV_PIX_FMT_BGR565BE) { rgb[0] = 0x1F; rgb[1] = 0x7E0; rgb[2] = 0xF800; @@ -104,12 +104,12 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, vclass = XWD_TRUE_COLOR; bpad = 16; break; - case PIX_FMT_RGB555LE: - case PIX_FMT_RGB555BE: - case PIX_FMT_BGR555LE: - case PIX_FMT_BGR555BE: - if (pix_fmt == PIX_FMT_BGR555LE || - pix_fmt == PIX_FMT_BGR555BE) { + case AV_PIX_FMT_RGB555LE: + case AV_PIX_FMT_RGB555BE: + case AV_PIX_FMT_BGR555LE: + case AV_PIX_FMT_BGR555BE: + if (pix_fmt == AV_PIX_FMT_BGR555LE || + pix_fmt == AV_PIX_FMT_BGR555BE) { rgb[0] = 0x1F; rgb[1] = 0x3E0; rgb[2] = 0x7C00; @@ -122,17 +122,17 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, vclass = XWD_TRUE_COLOR; bpad = 16; break; - case PIX_FMT_RGB8: - case PIX_FMT_BGR8: - case PIX_FMT_RGB4_BYTE: - case PIX_FMT_BGR4_BYTE: - case PIX_FMT_PAL8: + case AV_PIX_FMT_RGB8: + case AV_PIX_FMT_BGR8: + case AV_PIX_FMT_RGB4_BYTE: + case AV_PIX_FMT_BGR4_BYTE: + case AV_PIX_FMT_PAL8: bpp = 8; vclass = XWD_PSEUDO_COLOR; bpad = 8; ncolors = 256; break; - case PIX_FMT_MONOWHITE: + case AV_PIX_FMT_MONOWHITE: be = 1; bitorder = 1; bpp = 1; @@ -226,26 +226,26 @@ AVCodec ff_xwd_encoder = { .init = xwd_encode_init, .encode2 = xwd_encode_frame, .close = xwd_encode_close, - .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_BGRA, - PIX_FMT_RGBA, - PIX_FMT_ARGB, - PIX_FMT_ABGR, - PIX_FMT_RGB24, - PIX_FMT_BGR24, - PIX_FMT_RGB565BE, - PIX_FMT_RGB565LE, - PIX_FMT_BGR565BE, - PIX_FMT_BGR565LE, - PIX_FMT_RGB555BE, - PIX_FMT_RGB555LE, - PIX_FMT_BGR555BE, - PIX_FMT_BGR555LE, - PIX_FMT_RGB8, - PIX_FMT_BGR8, - PIX_FMT_RGB4_BYTE, - PIX_FMT_BGR4_BYTE, - PIX_FMT_PAL8, - PIX_FMT_MONOWHITE, - PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGRA, + AV_PIX_FMT_RGBA, + AV_PIX_FMT_ARGB, + AV_PIX_FMT_ABGR, + AV_PIX_FMT_RGB24, + AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGB565BE, + AV_PIX_FMT_RGB565LE, + AV_PIX_FMT_BGR565BE, + AV_PIX_FMT_BGR565LE, + AV_PIX_FMT_RGB555BE, + AV_PIX_FMT_RGB555LE, + AV_PIX_FMT_BGR555BE, + AV_PIX_FMT_BGR555LE, + AV_PIX_FMT_RGB8, + AV_PIX_FMT_BGR8, + AV_PIX_FMT_RGB4_BYTE, + AV_PIX_FMT_BGR4_BYTE, + AV_PIX_FMT_PAL8, + AV_PIX_FMT_MONOWHITE, + AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), }; -- cgit v1.2.3