From e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 12 May 2013 15:41:49 +0200 Subject: [PATCH] pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_* --- cmdutils.c | 10 +- doc/APIchanges | 3 + libavcodec/avpicture.c | 4 +- libavcodec/ffv1dec.c | 2 +- libavcodec/ffv1enc.c | 2 +- libavcodec/imgconvert.c | 12 +- libavcodec/pnm.c | 2 +- libavcodec/rawdec.c | 6 +- libavcodec/tiffenc.c | 4 +- libavcodec/utils.c | 4 +- libavcodec/xwdenc.c | 2 +- libavfilter/formats.c | 2 +- libavfilter/vf_crop.c | 2 +- libavfilter/vf_fieldorder.c | 4 +- libavfilter/vf_pixdesctest.c | 4 +- libavfilter/vf_scale.c | 4 +- libavutil/frame.c | 2 +- libavutil/imgutils.c | 20 +-- libavutil/pixdesc.c | 224 +++++++++++++++++----------------- libavutil/pixdesc.h | 51 ++++++-- libavutil/version.h | 4 +- libswscale/swscale_internal.h | 22 ++-- libswscale/swscale_unscaled.c | 2 +- 23 files changed, 214 insertions(+), 178 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index 62f38cc83e..1ff964b521 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1161,11 +1161,11 @@ int show_pix_fmts(void *optctx, const char *opt, const char *arg) while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) { enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(pix_desc); printf("%c%c%c%c%c %-16s %d %2d\n", - sws_isSupportedInput (pix_fmt) ? 'I' : '.', - sws_isSupportedOutput(pix_fmt) ? 'O' : '.', - pix_desc->flags & PIX_FMT_HWACCEL ? 'H' : '.', - pix_desc->flags & PIX_FMT_PAL ? 'P' : '.', - pix_desc->flags & PIX_FMT_BITSTREAM ? 'B' : '.', + sws_isSupportedInput (pix_fmt) ? 'I' : '.', + sws_isSupportedOutput(pix_fmt) ? 'O' : '.', + pix_desc->flags & AV_PIX_FMT_FLAG_HWACCEL ? 'H' : '.', + pix_desc->flags & AV_PIX_FMT_FLAG_PAL ? 'P' : '.', + pix_desc->flags & AV_PIX_FMT_FLAG_BITSTREAM ? 'B' : '.', pix_desc->name, pix_desc->nb_components, av_get_bits_per_pixel(pix_desc)); diff --git a/doc/APIchanges b/doc/APIchanges index a561c01d0f..fe1e1b3452 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-05-xx - xxxxxxx - lavu 52.11.0 - pixdesc.h + Replace PIX_FMT_* flags with AV_PIX_FMT_FLAG_*. + 2013-04-xx - xxxxxxx - lavc 55.4.0 - avcodec.h Add field_order to AVCodecParserContext. diff --git a/libavcodec/avpicture.c b/libavcodec/avpicture.c index 259fd8e690..a50bbc497f 100644 --- a/libavcodec/avpicture.c +++ b/libavcodec/avpicture.c @@ -75,7 +75,7 @@ int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt, } } - if (desc->flags & PIX_FMT_PAL) + if (desc->flags & AV_PIX_FMT_FLAG_PAL) memcpy((unsigned char *)(((size_t)dest + 3) & ~3), src->data[1], 256 * 4); @@ -92,7 +92,7 @@ int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height) return AVERROR(EINVAL); if ((ret = av_image_check_size(width, height, 0, NULL)) < 0) return ret; - if (desc->flags & PIX_FMT_PSEUDOPAL) + if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) // do not include palette for these pseudo-paletted formats return width * height; return avpicture_fill(&dummy_pict, NULL, pix_fmt, width, height); diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index c4f73c726e..499407ead2 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -335,7 +335,7 @@ static int decode_slice(AVCodecContext *c, void *arg) FFV1Context *fs = *(void **)arg; FFV1Context *f = fs->avctx->priv_data; int width, height, x, y, ret; - const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR) + const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) ? (c->bits_per_raw_sample > 8) + 1 : 4; AVFrame *const p = f->cur; diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index b7a2b22e1e..b0c79b932f 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -875,7 +875,7 @@ static int encode_slice(AVCodecContext *c, void *arg) int x = fs->slice_x; int y = fs->slice_y; AVFrame *const p = &f->picture; - const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR) + const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) ? (f->bits_per_raw_sample > 8) + 1 : 4; diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 52a6e3f54e..4eb049f1a9 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -60,7 +60,7 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int static int is_gray(const AVPixFmtDescriptor *desc) { - return desc->nb_components - (desc->flags & PIX_FMT_ALPHA) == 1; + return desc->nb_components - (desc->flags & AV_PIX_FMT_FLAG_ALPHA) == 1; } int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, @@ -86,11 +86,11 @@ int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, dst_desc->log2_chroma_h > src_desc->log2_chroma_h) loss |= FF_LOSS_RESOLUTION; - if ((src_desc->flags & PIX_FMT_RGB) != (dst_desc->flags & PIX_FMT_RGB)) + if ((src_desc->flags & AV_PIX_FMT_FLAG_RGB) != (dst_desc->flags & AV_PIX_FMT_FLAG_RGB)) loss |= FF_LOSS_COLORSPACE; - if (has_alpha && !(dst_desc->flags & PIX_FMT_ALPHA) && - (dst_desc->flags & PIX_FMT_ALPHA)) + if (has_alpha && !(dst_desc->flags & AV_PIX_FMT_FLAG_ALPHA) && + (dst_desc->flags & AV_PIX_FMT_FLAG_ALPHA)) loss |= FF_LOSS_ALPHA; if (dst_pix_fmt == AV_PIX_FMT_PAL8 && !is_gray(src_desc)) @@ -260,8 +260,8 @@ void ff_shrink88(uint8_t *dst, int dst_wrap, /* return true if yuv planar */ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) { - return (!(desc->flags & PIX_FMT_RGB) && - (desc->flags & PIX_FMT_PLANAR)); + return (!(desc->flags & AV_PIX_FMT_FLAG_RGB) && + (desc->flags & AV_PIX_FMT_FLAG_PLANAR)); } int av_picture_crop(AVPicture *dst, const AVPicture *src, diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 9d7c68dc64..eea30e8621 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -173,7 +173,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) }else s->maxval=1; /* more check if YUV420 */ - if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & PIX_FMT_PLANAR) { + if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) { if ((avctx->width & 1) != 0) return AVERROR_INVALIDDATA; h = (avctx->height * 2); diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 0a76e4d383..66265ced50 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -98,11 +98,11 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (desc->flags & (PIX_FMT_PAL | PIX_FMT_PSEUDOPAL)) { + if (desc->flags & (AV_PIX_FMT_FLAG_PAL | AV_PIX_FMT_FLAG_PSEUDOPAL)) { context->palette = av_buffer_alloc(AVPALETTE_SIZE); if (!context->palette) return AVERROR(ENOMEM); - if (desc->flags & PIX_FMT_PSEUDOPAL) + if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) avpriv_set_systematic_pal2((uint32_t*)context->palette->data, avctx->pix_fmt); else memset(context->palette->data, 0, AVPALETTE_SIZE); @@ -210,7 +210,7 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, } if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) || - (desc->flags & PIX_FMT_PSEUDOPAL)) { + (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) { frame->buf[1] = av_buffer_ref(context->palette); if (!frame->buf[1]) return AVERROR(ENOMEM); diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 8162c407d6..fc777ebae7 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -242,9 +242,9 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, case AV_PIX_FMT_PAL8: pfd = av_pix_fmt_desc_get(avctx->pix_fmt); s->bpp = av_get_bits_per_pixel(pfd); - if (pfd->flags & PIX_FMT_PAL) { + if (pfd->flags & AV_PIX_FMT_FLAG_PAL) { s->photometric_interpretation = 3; - } else if (pfd->flags & PIX_FMT_RGB) { + } else if (pfd->flags & AV_PIX_FMT_FLAG_RGB) { s->photometric_interpretation = 2; } else { s->photometric_interpretation = 1; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e2e12e27f3..c54af670e4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -663,7 +663,7 @@ do { \ planes = av_pix_fmt_count_planes(frame->format); /* workaround for AVHWAccel plane count of 0, buf[0] is used as check for allocated buffers: make libavcodec happy */ - if (desc && desc->flags & PIX_FMT_HWACCEL) + if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL) planes = 1; if (!desc || planes <= 0) { ret = AVERROR(EINVAL); @@ -793,7 +793,7 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, static int is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - return desc->flags & PIX_FMT_HWACCEL; + return desc->flags & AV_PIX_FMT_FLAG_HWACCEL; } enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt) diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index c9a2a5628f..c10146384b 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -51,7 +51,7 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, uint8_t *ptr, *buf; pixdepth = av_get_bits_per_pixel(desc); - if (desc->flags & PIX_FMT_BE) + if (desc->flags & AV_PIX_FMT_FLAG_BE) be = 1; switch (pix_fmt) { case AV_PIX_FMT_ARGB: diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 3b890d2bda..c7b8075139 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -216,7 +216,7 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type) for (fmt = 0; fmt < num_formats; fmt++) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); if ((type != AVMEDIA_TYPE_VIDEO) || - (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & PIX_FMT_HWACCEL))) + (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL))) ff_add_format(&ret, fmt); } diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index ec545b3d58..4dd93c8d22 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -261,7 +261,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) frame->data[0] += crop->y * frame->linesize[0]; frame->data[0] += crop->x * crop->max_step[0]; - if (!(desc->flags & PIX_FMT_PAL || desc->flags & PIX_FMT_PSEUDOPAL)) { + if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) { for (i = 1; i < 3; i ++) { if (frame->data[i]) { frame->data[i] += (crop->y >> crop->vsub) * frame->linesize[i]; diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index a7183a2091..c002b656d4 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -56,8 +56,8 @@ static int query_formats(AVFilterContext *ctx) formats = NULL; for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - if (!(desc->flags & PIX_FMT_HWACCEL || - desc->flags & PIX_FMT_BITSTREAM) && + if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL || + desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) && desc->nb_components && !desc->log2_chroma_h && (ret = ff_add_format(&formats, pix_fmt)) < 0) { ff_formats_unref(&formats); diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index 65f7eceb72..5407ec6989 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -78,8 +78,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } /* copy palette */ - if (priv->pix_desc->flags & PIX_FMT_PAL || - priv->pix_desc->flags & PIX_FMT_PSEUDOPAL) + if (priv->pix_desc->flags & AV_PIX_FMT_FLAG_PAL || + priv->pix_desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) memcpy(out->data[1], in->data[1], 256*4); for (c = 0; c < priv->pix_desc->nb_components; c++) { diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 53e336af0e..573e0b1d34 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -220,8 +220,8 @@ static int config_props(AVFilterLink *outlink) outlink->w, outlink->h, av_get_pix_fmt_name(outlink->format), scale->flags); - scale->input_is_pal = desc->flags & PIX_FMT_PAL || - desc->flags & PIX_FMT_PSEUDOPAL; + scale->input_is_pal = desc->flags & AV_PIX_FMT_FLAG_PAL || + desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL; if (scale->sws) sws_freeContext(scale->sws); diff --git a/libavutil/frame.c b/libavutil/frame.c index c4096e0f8f..cf60eb3229 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -93,7 +93,7 @@ static int get_video_buffer(AVFrame *frame, int align) frame->data[i] = frame->buf[i]->data; } - if (desc->flags & PIX_FMT_PAL || desc->flags & PIX_FMT_PSEUDOPAL) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) { av_buffer_unref(&frame->buf[1]); frame->buf[1] = av_buffer_alloc(1024); if (!frame->buf[1]) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 413329d50b..a8b4d2a7f7 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -55,7 +55,7 @@ int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane) if (!desc) return AVERROR(EINVAL); - if (desc->flags & PIX_FMT_BITSTREAM) + if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) return (width * (desc->comp[0].step_minus1+1) + 7) >> 3; av_image_fill_max_pixsteps(max_step, max_step_comp, desc); @@ -72,10 +72,10 @@ int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int wi memset(linesizes, 0, 4*sizeof(linesizes[0])); - if (!desc || desc->flags & PIX_FMT_HWACCEL) + if (!desc || desc->flags & AV_PIX_FMT_FLAG_HWACCEL) return AVERROR(EINVAL); - if (desc->flags & PIX_FMT_BITSTREAM) { + if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) { if (width > (INT_MAX -7) / (desc->comp[0].step_minus1+1)) return AVERROR(EINVAL); linesizes[0] = (width * (desc->comp[0].step_minus1+1) + 7) >> 3; @@ -102,7 +102,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); memset(data , 0, sizeof(data[0])*4); - if (!desc || desc->flags & PIX_FMT_HWACCEL) + if (!desc || desc->flags & AV_PIX_FMT_FLAG_HWACCEL) return AVERROR(EINVAL); data[0] = ptr; @@ -110,8 +110,8 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei return AVERROR(EINVAL); size[0] = linesizes[0] * height; - if (desc->flags & PIX_FMT_PAL || - desc->flags & PIX_FMT_PSEUDOPAL) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL || + desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) { size[0] = (size[0] + 3) & ~3; data[1] = ptr + size[0]; /* palette is stored here as 256 32 bits words */ return size[0] + 256 * 4; @@ -203,7 +203,7 @@ int av_image_alloc(uint8_t *pointers[4], int linesizes[4], av_free(buf); return ret; } - if (desc->flags & PIX_FMT_PAL || desc->flags & PIX_FMT_PSEUDOPAL) + if (desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) avpriv_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt); return ret; @@ -247,11 +247,11 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - if (!desc || desc->flags & PIX_FMT_HWACCEL) + if (!desc || desc->flags & AV_PIX_FMT_FLAG_HWACCEL) return; - if (desc->flags & PIX_FMT_PAL || - desc->flags & PIX_FMT_PSEUDOPAL) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL || + desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) { av_image_copy_plane(dst_data[0], dst_linesizes[0], src_data[0], src_linesizes[0], width, height); diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index fdc19292a0..7127d5c365 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -42,7 +42,7 @@ void av_read_image_line(uint16_t *dst, int step = comp.step_minus1 + 1; int flags = desc->flags; - if (flags & PIX_FMT_BITSTREAM) { + if (flags & AV_PIX_FMT_FLAG_BITSTREAM) { int skip = x * step + comp.offset_plus1 - 1; const uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3); int shift = 8 - depth - (skip & 7); @@ -62,11 +62,11 @@ void av_read_image_line(uint16_t *dst, int is_8bit = shift + depth <= 8; if (is_8bit) - p += !!(flags & PIX_FMT_BE); + p += !!(flags & AV_PIX_FMT_FLAG_BE); while (w--) { int val = is_8bit ? *p : - flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p); + flags & AV_PIX_FMT_FLAG_BE ? AV_RB16(p) : AV_RL16(p); val = (val >> shift) & mask; if (read_pal_component) val = data[1][4 * val + c]; @@ -87,7 +87,7 @@ void av_write_image_line(const uint16_t *src, int step = comp.step_minus1 + 1; int flags = desc->flags; - if (flags & PIX_FMT_BITSTREAM) { + if (flags & AV_PIX_FMT_FLAG_BITSTREAM) { int skip = x * step + comp.offset_plus1 - 1; uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3); int shift = 8 - depth - (skip & 7); @@ -104,14 +104,14 @@ void av_write_image_line(const uint16_t *src, x * step + comp.offset_plus1 - 1; if (shift + depth <= 8) { - p += !!(flags & PIX_FMT_BE); + p += !!(flags & AV_PIX_FMT_FLAG_BE); while (w--) { *p |= (*src++ << shift); p += step; } } else { while (w--) { - if (flags & PIX_FMT_BE) { + if (flags & AV_PIX_FMT_FLAG_BE) { uint16_t val = AV_RB16(p) | (*src++ << shift); AV_WB16(p, val); } else { @@ -138,7 +138,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* U */ { 2, 0, 1, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUYV422] = { .name = "yuyv422", @@ -161,7 +161,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 2, 2, 0, 7 }, /* G */ { 0, 2, 3, 0, 7 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR24] = { .name = "bgr24", @@ -173,7 +173,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 2, 2, 0, 7 }, /* G */ { 0, 2, 3, 0, 7 }, /* R */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_YUV422P] = { .name = "yuv422p", @@ -185,7 +185,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* U */ { 2, 0, 1, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P] = { .name = "yuv444p", @@ -197,7 +197,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* U */ { 2, 0, 1, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV410P] = { .name = "yuv410p", @@ -209,7 +209,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* U */ { 2, 0, 1, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV411P] = { .name = "yuv411p", @@ -221,7 +221,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* U */ { 2, 0, 1, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_GRAY8] = { .name = "gray", @@ -240,7 +240,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .comp = { { 0, 0, 1, 0, 0 }, /* Y */ }, - .flags = PIX_FMT_BITSTREAM, + .flags = AV_PIX_FMT_FLAG_BITSTREAM, }, [AV_PIX_FMT_MONOBLACK] = { .name = "monob", @@ -250,7 +250,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .comp = { { 0, 0, 1, 7, 0 }, /* Y */ }, - .flags = PIX_FMT_BITSTREAM, + .flags = AV_PIX_FMT_FLAG_BITSTREAM, }, [AV_PIX_FMT_PAL8] = { .name = "pal8", @@ -260,7 +260,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .comp = { { 0, 0, 1, 0, 7 }, }, - .flags = PIX_FMT_PAL, + .flags = AV_PIX_FMT_FLAG_PAL, }, [AV_PIX_FMT_YUVJ420P] = { .name = "yuvj420p", @@ -272,7 +272,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* U */ { 2, 0, 1, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUVJ422P] = { .name = "yuvj422p", @@ -284,7 +284,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* U */ { 2, 0, 1, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUVJ444P] = { .name = "yuvj444p", @@ -296,15 +296,15 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { {1, 0, 1, 0, 7}, /* U */ {2, 0, 1, 0, 7}, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_XVMC_MPEG2_MC] = { .name = "xvmcmc", - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_XVMC_MPEG2_IDCT] = { .name = "xvmcidct", - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_UYVY422] = { .name = "uyvy422", @@ -338,7 +338,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 0, 1, 3, 2 }, /* G */ { 0, 0, 1, 0, 2 }, /* R */ }, - .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL, }, [AV_PIX_FMT_BGR4] = { .name = "bgr4", @@ -350,7 +350,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 3, 2, 0, 1 }, /* G */ { 0, 3, 4, 0, 0 }, /* R */ }, - .flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR4_BYTE] = { .name = "bgr4_byte", @@ -362,7 +362,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 0, 1, 1, 1 }, /* G */ { 0, 0, 1, 0, 0 }, /* R */ }, - .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL, }, [AV_PIX_FMT_RGB8] = { .name = "rgb8", @@ -374,7 +374,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 0, 1, 3, 2 }, /* G */ { 0, 0, 1, 0, 2 }, /* B */ }, - .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL, }, [AV_PIX_FMT_RGB4] = { .name = "rgb4", @@ -386,7 +386,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 3, 2, 0, 1 }, /* G */ { 0, 3, 4, 0, 0 }, /* B */ }, - .flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB4_BYTE] = { .name = "rgb4_byte", @@ -398,7 +398,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 0, 1, 1, 1 }, /* G */ { 0, 0, 1, 0, 0 }, /* B */ }, - .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL, }, [AV_PIX_FMT_NV12] = { .name = "nv12", @@ -410,7 +410,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 7 }, /* U */ { 1, 1, 2, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_NV21] = { .name = "nv21", @@ -422,7 +422,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 7 }, /* V */ { 1, 1, 2, 0, 7 }, /* U */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_ARGB] = { .name = "argb", @@ -435,7 +435,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 3, 3, 0, 7 }, /* G */ { 0, 3, 4, 0, 7 }, /* B */ }, - .flags = PIX_FMT_RGB | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_RGBA] = { .name = "rgba", @@ -448,7 +448,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 3, 3, 0, 7 }, /* B */ { 0, 3, 4, 0, 7 }, /* A */ }, - .flags = PIX_FMT_RGB | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_ABGR] = { .name = "abgr", @@ -461,7 +461,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 3, 3, 0, 7 }, /* G */ { 0, 3, 4, 0, 7 }, /* R */ }, - .flags = PIX_FMT_RGB | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_BGRA] = { .name = "bgra", @@ -474,7 +474,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 3, 3, 0, 7 }, /* R */ { 0, 3, 4, 0, 7 }, /* A */ }, - .flags = PIX_FMT_RGB | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_GRAY16BE] = { .name = "gray16be", @@ -484,7 +484,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .comp = { { 0, 1, 1, 0, 15 }, /* Y */ }, - .flags = PIX_FMT_BE, + .flags = AV_PIX_FMT_FLAG_BE, }, [AV_PIX_FMT_GRAY16LE] = { .name = "gray16le", @@ -505,7 +505,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* U */ { 2, 0, 1, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUVJ440P] = { .name = "yuvj440p", @@ -517,7 +517,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* U */ { 2, 0, 1, 0, 7 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUVA420P] = { .name = "yuva420p", @@ -530,7 +530,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 0, 1, 0, 7 }, /* V */ { 3, 0, 1, 0, 7 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P] = { .name = "yuva422p", @@ -543,7 +543,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 0, 1, 0, 7 }, /* V */ { 3, 0, 1, 0, 7 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P] = { .name = "yuva444p", @@ -556,7 +556,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 0, 1, 0, 7 }, /* V */ { 3, 0, 1, 0, 7 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P9BE] = { .name = "yuva420p9be", @@ -569,7 +569,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 8 }, /* V */ { 3, 1, 1, 0, 8 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUVA420P9LE] = { .name = "yuva420p9le", @@ -582,7 +582,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 8 }, /* V */ { 3, 1, 1, 0, 8 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P9BE] = { .name = "yuva422p9be", @@ -595,7 +595,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 8 }, /* V */ { 3, 1, 1, 0, 8 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P9LE] = { .name = "yuva422p9le", @@ -608,7 +608,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 8 }, /* V */ { 3, 1, 1, 0, 8 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P9BE] = { .name = "yuva444p9be", @@ -621,7 +621,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 8 }, /* V */ { 3, 1, 1, 0, 8 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P9LE] = { .name = "yuva444p9le", @@ -634,7 +634,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 8 }, /* V */ { 3, 1, 1, 0, 8 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P10BE] = { .name = "yuva420p10be", @@ -647,7 +647,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 9 }, /* V */ { 3, 1, 1, 0, 9 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P10LE] = { .name = "yuva420p10le", @@ -660,7 +660,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 9 }, /* V */ { 3, 1, 1, 0, 9 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P10BE] = { .name = "yuva422p10be", @@ -673,7 +673,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 9 }, /* V */ { 3, 1, 1, 0, 9 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P10LE] = { .name = "yuva422p10le", @@ -686,7 +686,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 9 }, /* V */ { 3, 1, 1, 0, 9 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P10BE] = { .name = "yuva444p10be", @@ -699,7 +699,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 9 }, /* V */ { 3, 1, 1, 0, 9 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P10LE] = { .name = "yuva444p10le", @@ -712,7 +712,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 9 }, /* V */ { 3, 1, 1, 0, 9 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P16BE] = { .name = "yuva420p16be", @@ -725,7 +725,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 15 }, /* V */ { 3, 1, 1, 0, 15 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P16LE] = { .name = "yuva420p16le", @@ -738,7 +738,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 15 }, /* V */ { 3, 1, 1, 0, 15 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P16BE] = { .name = "yuva422p16be", @@ -751,7 +751,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 15 }, /* V */ { 3, 1, 1, 0, 15 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P16LE] = { .name = "yuva422p16le", @@ -764,7 +764,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 15 }, /* V */ { 3, 1, 1, 0, 15 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P16BE] = { .name = "yuva444p16be", @@ -777,7 +777,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 15 }, /* V */ { 3, 1, 1, 0, 15 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P16LE] = { .name = "yuva444p16le", @@ -790,43 +790,43 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 2, 1, 1, 0, 15 }, /* V */ { 3, 1, 1, 0, 15 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_VDPAU_H264] = { .name = "vdpau_h264", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_MPEG1] = { .name = "vdpau_mpeg1", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_MPEG2] = { .name = "vdpau_mpeg2", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_WMV3] = { .name = "vdpau_wmv3", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_VC1] = { .name = "vdpau_vc1", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_MPEG4] = { .name = "vdpau_mpeg4", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_RGB48BE] = { .name = "rgb48be", @@ -838,7 +838,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 5, 3, 0, 15 }, /* G */ { 0, 5, 5, 0, 15 }, /* B */ }, - .flags = PIX_FMT_RGB | PIX_FMT_BE, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE, }, [AV_PIX_FMT_RGB48LE] = { .name = "rgb48le", @@ -850,7 +850,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 5, 3, 0, 15 }, /* G */ { 0, 5, 5, 0, 15 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB565BE] = { .name = "rgb565be", @@ -862,7 +862,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 5, 5 }, /* G */ { 0, 1, 1, 0, 4 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB565LE] = { .name = "rgb565le", @@ -874,7 +874,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 5, 5 }, /* G */ { 0, 1, 1, 0, 4 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB555BE] = { .name = "rgb555be", @@ -886,7 +886,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 5, 4 }, /* G */ { 0, 1, 1, 0, 4 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB555LE] = { .name = "rgb555le", @@ -898,7 +898,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 5, 4 }, /* G */ { 0, 1, 1, 0, 4 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB444BE] = { .name = "rgb444be", @@ -910,7 +910,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 4, 3 }, /* G */ { 0, 1, 1, 0, 3 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB444LE] = { .name = "rgb444le", @@ -922,7 +922,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 4, 3 }, /* G */ { 0, 1, 1, 0, 3 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR48BE] = { .name = "bgr48be", @@ -934,7 +934,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 5, 3, 0, 15 }, /* G */ { 0, 5, 5, 0, 15 }, /* R */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR48LE] = { .name = "bgr48le", @@ -946,7 +946,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 5, 3, 0, 15 }, /* G */ { 0, 5, 5, 0, 15 }, /* R */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR565BE] = { .name = "bgr565be", @@ -958,7 +958,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 5, 5 }, /* G */ { 0, 1, 1, 0, 4 }, /* R */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR565LE] = { .name = "bgr565le", @@ -970,7 +970,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 5, 5 }, /* G */ { 0, 1, 1, 0, 4 }, /* R */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR555BE] = { .name = "bgr555be", @@ -982,7 +982,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 5, 4 }, /* G */ { 0, 1, 1, 0, 4 }, /* R */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR555LE] = { .name = "bgr555le", @@ -994,7 +994,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 5, 4 }, /* G */ { 0, 1, 1, 0, 4 }, /* R */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR444BE] = { .name = "bgr444be", @@ -1006,7 +1006,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 4, 3 }, /* G */ { 0, 1, 1, 0, 3 }, /* R */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR444LE] = { .name = "bgr444le", @@ -1018,31 +1018,31 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 4, 3 }, /* G */ { 0, 1, 1, 0, 3 }, /* R */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_VAAPI_MOCO] = { .name = "vaapi_moco", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VAAPI_IDCT] = { .name = "vaapi_idct", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VAAPI_VLD] = { .name = "vaapi_vld", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDA_VLD] = { .name = "vda_vld", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_YUV420P9LE] = { .name = "yuv420p9le", @@ -1054,7 +1054,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 8 }, /* U */ { 2, 1, 1, 0, 8 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P9BE] = { .name = "yuv420p9be", @@ -1066,7 +1066,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 8 }, /* U */ { 2, 1, 1, 0, 8 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P10LE] = { .name = "yuv420p10le", @@ -1078,7 +1078,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 9 }, /* U */ { 2, 1, 1, 0, 9 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P10BE] = { .name = "yuv420p10be", @@ -1090,7 +1090,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 9 }, /* U */ { 2, 1, 1, 0, 9 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P16LE] = { .name = "yuv420p16le", @@ -1102,7 +1102,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* U */ { 2, 1, 1, 0, 15 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P16BE] = { .name = "yuv420p16be", @@ -1114,7 +1114,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* U */ { 2, 1, 1, 0, 15 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P9LE] = { .name = "yuv422p9le", @@ -1126,7 +1126,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 8 }, /* U */ { 2, 1, 1, 0, 8 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P9BE] = { .name = "yuv422p9be", @@ -1138,7 +1138,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 8 }, /* U */ { 2, 1, 1, 0, 8 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P10LE] = { .name = "yuv422p10le", @@ -1150,7 +1150,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 9 }, /* U */ { 2, 1, 1, 0, 9 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P10BE] = { .name = "yuv422p10be", @@ -1162,7 +1162,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 9 }, /* U */ { 2, 1, 1, 0, 9 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P16LE] = { .name = "yuv422p16le", @@ -1174,7 +1174,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* U */ { 2, 1, 1, 0, 15 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P16BE] = { .name = "yuv422p16be", @@ -1186,7 +1186,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* U */ { 2, 1, 1, 0, 15 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P16LE] = { .name = "yuv444p16le", @@ -1198,7 +1198,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* U */ { 2, 1, 1, 0, 15 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P16BE] = { .name = "yuv444p16be", @@ -1210,7 +1210,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* U */ { 2, 1, 1, 0, 15 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P10LE] = { .name = "yuv444p10le", @@ -1222,7 +1222,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 9 }, /* U */ { 2, 1, 1, 0, 9 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P10BE] = { .name = "yuv444p10be", @@ -1234,7 +1234,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 9 }, /* U */ { 2, 1, 1, 0, 9 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P9LE] = { .name = "yuv444p9le", @@ -1246,7 +1246,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 8 }, /* U */ { 2, 1, 1, 0, 8 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P9BE] = { .name = "yuv444p9be", @@ -1258,13 +1258,13 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 8 }, /* U */ { 2, 1, 1, 0, 8 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_DXVA2_VLD] = { .name = "dxva2_vld", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_Y400A] = { .name = "y400a", @@ -1273,7 +1273,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 1, 0, 7 }, /* Y */ { 0, 1, 2, 0, 7 }, /* A */ }, - .flags = PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_GBRP] = { .name = "gbrp", @@ -1285,7 +1285,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* B */ { 2, 0, 1, 0, 7 }, /* R */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP9LE] = { .name = "gbrp9le", @@ -1297,7 +1297,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 8 }, /* B */ { 2, 1, 1, 0, 8 }, /* R */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP9BE] = { .name = "gbrp9be", @@ -1309,7 +1309,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 8 }, /* B */ { 2, 1, 1, 0, 8 }, /* R */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP10LE] = { .name = "gbrp10le", @@ -1321,7 +1321,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 9 }, /* B */ { 2, 1, 1, 0, 9 }, /* R */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP10BE] = { .name = "gbrp10be", @@ -1333,7 +1333,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 9 }, /* B */ { 2, 1, 1, 0, 9 }, /* R */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP16LE] = { .name = "gbrp16le", @@ -1345,7 +1345,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* B */ { 2, 1, 1, 0, 15 }, /* R */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP16BE] = { .name = "gbrp16be", @@ -1357,13 +1357,13 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* B */ { 2, 1, 1, 0, 15 }, /* R */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_VDPAU] = { .name = "vdpau", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_XYZ12LE] = { .name = "xyz12le", @@ -1387,7 +1387,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 5, 3, 4, 11 }, /* Y */ { 0, 5, 5, 4, 11 }, /* Z */ }, - .flags = PIX_FMT_BE, + .flags = AV_PIX_FMT_FLAG_BE, }, }; diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index 1d73e5db51..143c0fa8b2 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -83,21 +83,54 @@ typedef struct AVPixFmtDescriptor{ AVComponentDescriptor comp[4]; }AVPixFmtDescriptor; -#define PIX_FMT_BE 1 ///< Pixel format is big-endian. -#define PIX_FMT_PAL 2 ///< Pixel format has a palette in data[1], values are indexes in this palette. -#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end. -#define PIX_FMT_HWACCEL 8 ///< Pixel format is an HW accelerated format. -#define PIX_FMT_PLANAR 16 ///< At least one pixel component is not in the first data plane -#define PIX_FMT_RGB 32 ///< The pixel format contains RGB-like data (as opposed to YUV/grayscale) +/** + * Pixel format is big-endian. + */ +#define AV_PIX_FMT_FLAG_BE (1 << 0) +/** + * Pixel format has a palette in data[1], values are indexes in this palette. + */ +#define AV_PIX_FMT_FLAG_PAL (1 << 1) +/** + * All values of a component are bit-wise packed end to end. + */ +#define AV_PIX_FMT_FLAG_BITSTREAM (1 << 2) +/** + * Pixel format is an HW accelerated format. + */ +#define AV_PIX_FMT_FLAG_HWACCEL (1 << 3) +/** + * At least one pixel component is not in the first data plane. + */ +#define AV_PIX_FMT_FLAG_PLANAR (1 << 4) +/** + * The pixel format contains RGB-like data (as opposed to YUV/grayscale). + */ +#define AV_PIX_FMT_FLAG_RGB (1 << 5) /** * The pixel format is "pseudo-paletted". This means that Libav treats it as * paletted internally, but the palette is generated by the decoder and is not * stored in the file. */ -#define PIX_FMT_PSEUDOPAL 64 - -#define PIX_FMT_ALPHA 128 ///< The pixel format has an alpha channel +#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6) +/** + * The pixel format has an alpha channel. + */ +#define AV_PIX_FMT_FLAG_ALPHA (1 << 7) +#if FF_API_PIX_FMT +/** + * @deprecate use the AV_PIX_FMT_FLAG_* flags + */ +#define PIX_FMT_BE AV_PIX_FMT_FLAG_BE +#define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL +#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM +#define PIX_FMT_HWACCEL AV_PIX_FMT_FLAG_HWACCEL +#define PIX_FMT_PLANAR AV_PIX_FMT_FLAG_PLANAR +#define PIX_FMT_RGB AV_PIX_FMT_FLAG_RGB +#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL +#define PIX_FMT_ALPHA AV_PIX_FMT_FLAG_ALPHA +#endif #if FF_API_PIX_FMT_DESC /** diff --git a/libavutil/version.h b/libavutil/version.h index 948a28f992..066c06160f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -37,8 +37,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 10 -#define LIBAVUTIL_VERSION_MICRO 1 +#define LIBAVUTIL_VERSION_MINOR 11 +#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index f9f023f1cf..9544309cb7 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -596,33 +596,33 @@ static av_always_inline int isBE(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return desc->flags & PIX_FMT_BE; + return desc->flags & AV_PIX_FMT_FLAG_BE; } static av_always_inline int isYUV(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return !(desc->flags & PIX_FMT_RGB) && desc->nb_components >= 2; + return !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2; } static av_always_inline int isPlanarYUV(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->flags & PIX_FMT_PLANAR) && isYUV(pix_fmt)); + return ((desc->flags & AV_PIX_FMT_FLAG_PLANAR) && isYUV(pix_fmt)); } static av_always_inline int isRGB(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return (desc->flags & PIX_FMT_RGB); + return (desc->flags & AV_PIX_FMT_FLAG_RGB); } #if 0 // FIXME #define isGray(x) \ - (!(av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) && \ + (!(av_pix_fmt_descriptors[x].flags & AV_PIX_FMT_FLAG_PAL) && \ av_pix_fmt_descriptors[x].nb_components <= 2) #else #define isGray(x) \ @@ -683,7 +683,7 @@ static av_always_inline int isPacked(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->nb_components >= 2 && !(desc->flags & PIX_FMT_PLANAR)) || + return ((desc->nb_components >= 2 && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) || pix_fmt == AV_PIX_FMT_PAL8); } @@ -691,29 +691,29 @@ static av_always_inline int isPlanar(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return (desc->nb_components >= 2 && (desc->flags & PIX_FMT_PLANAR)); + return (desc->nb_components >= 2 && (desc->flags & AV_PIX_FMT_FLAG_PLANAR)); } static av_always_inline int isPackedRGB(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->flags & (PIX_FMT_PLANAR | PIX_FMT_RGB)) == PIX_FMT_RGB); + return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)) == AV_PIX_FMT_FLAG_RGB); } static av_always_inline int isPlanarRGB(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->flags & (PIX_FMT_PLANAR | PIX_FMT_RGB)) == - (PIX_FMT_PLANAR | PIX_FMT_RGB)); + return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)) == + (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)); } static av_always_inline int usePal(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->flags & PIX_FMT_PAL) || (desc->flags & PIX_FMT_PSEUDOPAL) || + return ((desc->flags & AV_PIX_FMT_FLAG_PAL) || (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) || pix_fmt == AV_PIX_FMT_Y400A); } diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 433dbdb46e..9e7beb2b24 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -563,7 +563,7 @@ static rgbConvFn findRgbConvFn(SwsContext *c) #define IS_NOT_NE(bpp, desc) \ (((bpp + 7) >> 3) == 2 && \ - (!(desc->flags & PIX_FMT_BE) != !HAVE_BIGENDIAN)) + (!(desc->flags & AV_PIX_FMT_FLAG_BE) != !HAVE_BIGENDIAN)) /* if this is non-native rgb444/555/565, don't handle it here. */ if (IS_NOT_NE(srcId, desc_src) || IS_NOT_NE(dstId, desc_dst))