pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*

Anton Khirnov committed 13 years ago

Commit e6c4ac71 parent 7c57a5823 files · +214 −178Browse files

Unified · Split

23 files

cmdutils.c +5 −5
doc/APIchanges +3 −0
libavcodec/avpicture.c +2 −2
libavcodec/ffv1dec.c +1 −1
libavcodec/ffv1enc.c +1 −1
libavcodec/imgconvert.c +6 −6
libavcodec/pnm.c +1 −1
libavcodec/rawdec.c +3 −3
libavcodec/tiffenc.c +2 −2
libavcodec/utils.c +2 −2
libavcodec/xwdenc.c +1 −1
libavfilter/formats.c +1 −1
libavfilter/vf_crop.c +1 −1
libavfilter/vf_fieldorder.c +2 −2
libavfilter/vf_pixdesctest.c +2 −2
libavfilter/vf_scale.c +2 −2
libavutil/frame.c +1 −1
libavutil/imgutils.c +10 −10
libavutil/pixdesc.c +112 −112
libavutil/pixdesc.h +42 −9
libavutil/version.h +2 −2
libswscale/swscale_internal.h +11 −11
libswscale/swscale_unscaled.c +1 −1

@@ -1161,11 +1161,11 @@ int show_pix_fmts(void optctx, const char opt, const char *arg) · 1160 unmodified lines
1161	1161	while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) {
1162	1162	enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(pix_desc);
1163	1163	printf("%c%c%c%c%c %-16s %d %2d\n",
1164		− sws_isSupportedInput (pix_fmt) ? 'I' : '.',
1165		− sws_isSupportedOutput(pix_fmt) ? 'O' : '.',
1166		− pix_desc->flags & PIX_FMT_HWACCEL ? 'H' : '.',
1167		− pix_desc->flags & PIX_FMT_PAL ? 'P' : '.',
1168		− pix_desc->flags & PIX_FMT_BITSTREAM ? 'B' : '.',
	1164	+ sws_isSupportedInput (pix_fmt) ? 'I' : '.',
	1165	+ sws_isSupportedOutput(pix_fmt) ? 'O' : '.',
	1166	+ pix_desc->flags & AV_PIX_FMT_FLAG_HWACCEL ? 'H' : '.',
	1167	+ pix_desc->flags & AV_PIX_FMT_FLAG_PAL ? 'P' : '.',
	1168	+ pix_desc->flags & AV_PIX_FMT_FLAG_BITSTREAM ? 'B' : '.',
1169	1169	pix_desc->name,
1170	1170	pix_desc->nb_components,
1171	1171	av_get_bits_per_pixel(pix_desc));

doc/APIchanges+3−0

@@ -13,6 +13,9 @@ libavutil: 2012-10-22 · 12 unmodified lines
13	13
14	14	API changes, most recent first:
15	15
	16	+2013-05-xx - xxxxxxx - lavu 52.11.0 - pixdesc.h
	17	+ Replace PIX_FMT_* flags with AV_PIX_FMT_FLAG_*.
	18	+
16	19	2013-04-xx - xxxxxxx - lavc 55.4.0 - avcodec.h
17	20	Add field_order to AVCodecParserContext.
18	21

libavcodec/avpicture.c+2−2

@@ -75,7 +75,7 @@ int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt, · 74 unmodified lines
75	75	}
76	76	}
77	77
78		− if (desc->flags & PIX_FMT_PAL)
	78	+ if (desc->flags & AV_PIX_FMT_FLAG_PAL)
79	79	memcpy((unsigned char *)(((size_t)dest + 3) & ~3),
80	80	src->data[1], 256 * 4);
81	81
@@ -92,7 +92,7 @@ int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height) · 10 unmodified lines
92	92	return AVERROR(EINVAL);
93	93	if ((ret = av_image_check_size(width, height, 0, NULL)) < 0)
94	94	return ret;
95		− if (desc->flags & PIX_FMT_PSEUDOPAL)
	95	+ if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
96	96	// do not include palette for these pseudo-paletted formats
97	97	return width * height;
98	98	return avpicture_fill(&dummy_pict, NULL, pix_fmt, width, height);

libavcodec/ffv1dec.c+1−1

@@ -335,7 +335,7 @@ static int decode_slice(AVCodecContext c, void arg) · 334 unmodified lines
335	335	FFV1Context fs = (void **)arg;
336	336	FFV1Context *f = fs->avctx->priv_data;
337	337	int width, height, x, y, ret;
338		− const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
	338	+ const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR)
339	339	? (c->bits_per_raw_sample > 8) + 1
340	340	: 4;
341	341	AVFrame *const p = f->cur;

libavcodec/ffv1enc.c+1−1

@@ -875,7 +875,7 @@ static int encode_slice(AVCodecContext c, void arg) · 874 unmodified lines
875	875	int x = fs->slice_x;
876	876	int y = fs->slice_y;
877	877	AVFrame *const p = &f->picture;
878		− const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
	878	+ const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR)
879	879	? (f->bits_per_raw_sample > 8) + 1
880	880	: 4;
881	881

libavcodec/imgconvert.c+6−6

@@ -60,7 +60,7 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int · 59 unmodified lines
60	60
61	61	static int is_gray(const AVPixFmtDescriptor *desc)
62	62	{
63		− return desc->nb_components - (desc->flags & PIX_FMT_ALPHA) == 1;
	63	+ return desc->nb_components - (desc->flags & AV_PIX_FMT_FLAG_ALPHA) == 1;
64	64	}
65	65
66	66	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, · 19 unmodified lines
86	86	dst_desc->log2_chroma_h > src_desc->log2_chroma_h)
87	87	loss \|= FF_LOSS_RESOLUTION;
88	88
89		− if ((src_desc->flags & PIX_FMT_RGB) != (dst_desc->flags & PIX_FMT_RGB))
	89	+ if ((src_desc->flags & AV_PIX_FMT_FLAG_RGB) != (dst_desc->flags & AV_PIX_FMT_FLAG_RGB))
90	90	loss \|= FF_LOSS_COLORSPACE;
91	91
92		− if (has_alpha && !(dst_desc->flags & PIX_FMT_ALPHA) &&
93		− (dst_desc->flags & PIX_FMT_ALPHA))
	92	+ if (has_alpha && !(dst_desc->flags & AV_PIX_FMT_FLAG_ALPHA) &&
	93	+ (dst_desc->flags & AV_PIX_FMT_FLAG_ALPHA))
94	94	loss \|= FF_LOSS_ALPHA;
95	95
96	96	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, · 163 unmodified lines
260	260	/* return true if yuv planar */
261	261	static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
262	262	{
263		− return (!(desc->flags & PIX_FMT_RGB) &&
264		− (desc->flags & PIX_FMT_PLANAR));
	263	+ return (!(desc->flags & AV_PIX_FMT_FLAG_RGB) &&
	264	+ (desc->flags & AV_PIX_FMT_FLAG_PLANAR));
265	265	}
266	266
267	267	int av_picture_crop(AVPicture dst, const AVPicture src,

libavcodec/pnm.c+1−1

@@ -173,7 +173,7 @@ int ff_pnm_decode_header(AVCodecContext avctx, PNMContext const s) · 172 unmodified lines
173	173	}else
174	174	s->maxval=1;
175	175	/* more check if YUV420 */
176		− if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & PIX_FMT_PLANAR) {
	176	+ if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) {
177	177	if ((avctx->width & 1) != 0)
178	178	return AVERROR_INVALIDDATA;
179	179	h = (avctx->height * 2);

libavcodec/rawdec.c+3−3

@@ -98,11 +98,11 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) · 97 unmodified lines
98	98	return AVERROR(EINVAL);
99	99	}
100	100
101		− if (desc->flags & (PIX_FMT_PAL \| PIX_FMT_PSEUDOPAL)) {
	101	+ if (desc->flags & (AV_PIX_FMT_FLAG_PAL \| AV_PIX_FMT_FLAG_PSEUDOPAL)) {
102	102	context->palette = av_buffer_alloc(AVPALETTE_SIZE);
103	103	if (!context->palette)
104	104	return AVERROR(ENOMEM);
105		− if (desc->flags & PIX_FMT_PSEUDOPAL)
	105	+ if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
106	106	avpriv_set_systematic_pal2((uint32_t*)context->palette->data, avctx->pix_fmt);
107	107	else
108	108	memset(context->palette->data, 0, AVPALETTE_SIZE);
@@ -210,7 +210,7 @@ static int raw_decode(AVCodecContext avctx, void data, int *got_frame, · 101 unmodified lines
210	210	}
211	211
212	212	if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) \|\|
213		− (desc->flags & PIX_FMT_PSEUDOPAL)) {
	213	+ (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) {
214	214	frame->buf[1] = av_buffer_ref(context->palette);
215	215	if (!frame->buf[1])
216	216	return AVERROR(ENOMEM);

libavcodec/tiffenc.c+2−2

@@ -242,9 +242,9 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, · 241 unmodified lines
242	242	case AV_PIX_FMT_PAL8:
243	243	pfd = av_pix_fmt_desc_get(avctx->pix_fmt);
244	244	s->bpp = av_get_bits_per_pixel(pfd);
245		− if (pfd->flags & PIX_FMT_PAL) {
	245	+ if (pfd->flags & AV_PIX_FMT_FLAG_PAL) {
246	246	s->photometric_interpretation = 3;
247		− } else if (pfd->flags & PIX_FMT_RGB) {
	247	+ } else if (pfd->flags & AV_PIX_FMT_FLAG_RGB) {
248	248	s->photometric_interpretation = 2;
249	249	} else {
250	250	s->photometric_interpretation = 1;

libavcodec/utils.c+2−2

@@ -663,7 +663,7 @@ do { \ · 662 unmodified lines
663	663	planes = av_pix_fmt_count_planes(frame->format);
664	664	/* workaround for AVHWAccel plane count of 0, buf[0] is used as
665	665	check for allocated buffers: make libavcodec happy */
666		− if (desc && desc->flags & PIX_FMT_HWACCEL)
	666	+ if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
667	667	planes = 1;
668	668	if (!desc \|\| planes <= 0) {
669	669	ret = AVERROR(EINVAL);
@@ -793,7 +793,7 @@ int avcodec_default_execute2(AVCodecContext c, int (func)(AVCodecContext *c2, · 123 unmodified lines
793	793	static int is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt)
794	794	{
795	795	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
796		− return desc->flags & PIX_FMT_HWACCEL;
	796	+ return desc->flags & AV_PIX_FMT_FLAG_HWACCEL;
797	797	}
798	798
799	799	enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext s, const enum AVPixelFormat fmt)

libavcodec/xwdenc.c+1−1

@@ -51,7 +51,7 @@ static int xwd_encode_frame(AVCodecContext avctx, AVPacket pkt, · 50 unmodified lines
51	51	uint8_t ptr, buf;
52	52
53	53	pixdepth = av_get_bits_per_pixel(desc);
54		− if (desc->flags & PIX_FMT_BE)
	54	+ if (desc->flags & AV_PIX_FMT_FLAG_BE)
55	55	be = 1;
56	56	switch (pix_fmt) {
57	57	case AV_PIX_FMT_ARGB:

libavfilter/formats.c+1−1

@@ -216,7 +216,7 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type) · 215 unmodified lines
216	216	for (fmt = 0; fmt < num_formats; fmt++) {
217	217	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
218	218	if ((type != AVMEDIA_TYPE_VIDEO) \|\|
219		− (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & PIX_FMT_HWACCEL)))
	219	+ (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)))
220	220	ff_add_format(&ret, fmt);
221	221	}
222	222

libavfilter/vf_crop.c+1−1

@@ -261,7 +261,7 @@ static int filter_frame(AVFilterLink link, AVFrame frame) · 260 unmodified lines
261	261	frame->data[0] += crop->y * frame->linesize[0];
262	262	frame->data[0] += crop->x * crop->max_step[0];
263	263
264		− if (!(desc->flags & PIX_FMT_PAL \|\| desc->flags & PIX_FMT_PSEUDOPAL)) {
	264	+ if (!(desc->flags & AV_PIX_FMT_FLAG_PAL \|\| desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) {
265	265	for (i = 1; i < 3; i ++) {
266	266	if (frame->data[i]) {
267	267	frame->data[i] += (crop->y >> crop->vsub) * frame->linesize[i];

libavfilter/vf_fieldorder.c+2−2

@@ -56,8 +56,8 @@ static int query_formats(AVFilterContext *ctx) · 55 unmodified lines
56	56	formats = NULL;
57	57	for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) {
58	58	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
59		− if (!(desc->flags & PIX_FMT_HWACCEL \|\|
60		− desc->flags & PIX_FMT_BITSTREAM) &&
	59	+ if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL \|\|
	60	+ desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) &&
61	61	desc->nb_components && !desc->log2_chroma_h &&
62	62	(ret = ff_add_format(&formats, pix_fmt)) < 0) {
63	63	ff_formats_unref(&formats);

libavfilter/vf_pixdesctest.c+2−2

@@ -78,8 +78,8 @@ static int filter_frame(AVFilterLink inlink, AVFrame in) · 77 unmodified lines
78	78	}
79	79
80	80	/* copy palette */
81		− if (priv->pix_desc->flags & PIX_FMT_PAL \|\|
82		− priv->pix_desc->flags & PIX_FMT_PSEUDOPAL)
	81	+ if (priv->pix_desc->flags & AV_PIX_FMT_FLAG_PAL \|\|
	82	+ priv->pix_desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
83	83	memcpy(out->data[1], in->data[1], 256*4);
84	84
85	85	for (c = 0; c < priv->pix_desc->nb_components; c++) {

libavfilter/vf_scale.c+2−2

@@ -220,8 +220,8 @@ static int config_props(AVFilterLink *outlink) · 219 unmodified lines
220	220	outlink->w, outlink->h, av_get_pix_fmt_name(outlink->format),
221	221	scale->flags);
222	222
223		− scale->input_is_pal = desc->flags & PIX_FMT_PAL \|\|
224		− desc->flags & PIX_FMT_PSEUDOPAL;
	223	+ scale->input_is_pal = desc->flags & AV_PIX_FMT_FLAG_PAL \|\|
	224	+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL;
225	225
226	226	if (scale->sws)
227	227	sws_freeContext(scale->sws);

libavutil/frame.c+1−1

@@ -93,7 +93,7 @@ static int get_video_buffer(AVFrame *frame, int align) · 92 unmodified lines
93	93
94	94	frame->data[i] = frame->buf[i]->data;
95	95	}
96		− if (desc->flags & PIX_FMT_PAL \|\| desc->flags & PIX_FMT_PSEUDOPAL) {
	96	+ if (desc->flags & AV_PIX_FMT_FLAG_PAL \|\| desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
97	97	av_buffer_unref(&frame->buf[1]);
98	98	frame->buf[1] = av_buffer_alloc(1024);
99	99	if (!frame->buf[1])

libavutil/imgutils.c+10−10

@@ -55,7 +55,7 @@ int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane) · 54 unmodified lines
55	55	if (!desc)
56	56	return AVERROR(EINVAL);
57	57
58		− if (desc->flags & PIX_FMT_BITSTREAM)
	58	+ if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM)
59	59	return (width * (desc->comp[0].step_minus1+1) + 7) >> 3;
60	60
61	61	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 · 10 unmodified lines
72	72
73	73	memset(linesizes, 0, 4*sizeof(linesizes[0]));
74	74
75		− if (!desc \|\| desc->flags & PIX_FMT_HWACCEL)
	75	+ if (!desc \|\| desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
76	76	return AVERROR(EINVAL);
77	77
78		− if (desc->flags & PIX_FMT_BITSTREAM) {
	78	+ if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) {
79	79	if (width > (INT_MAX -7) / (desc->comp[0].step_minus1+1))
80	80	return AVERROR(EINVAL);
81	81	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 · 20 unmodified lines
102	102	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
103	103	memset(data , 0, sizeof(data[0])*4);
104	104
105		− if (!desc \|\| desc->flags & PIX_FMT_HWACCEL)
	105	+ if (!desc \|\| desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
106	106	return AVERROR(EINVAL);
107	107
108	108	data[0] = ptr;
@@ -110,8 +110,8 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei · 1 unmodified line
110	110	return AVERROR(EINVAL);
111	111	size[0] = linesizes[0] * height;
112	112
113		− if (desc->flags & PIX_FMT_PAL \|\|
114		− desc->flags & PIX_FMT_PSEUDOPAL) {
	113	+ if (desc->flags & AV_PIX_FMT_FLAG_PAL \|\|
	114	+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
115	115	size[0] = (size[0] + 3) & ~3;
116	116	data[1] = ptr + size[0]; /* palette is stored here as 256 32 bits words */
117	117	return size[0] + 256 * 4;
@@ -203,7 +203,7 @@ int av_image_alloc(uint8_t *pointers[4], int linesizes[4], · 85 unmodified lines
203	203	av_free(buf);
204	204	return ret;
205	205	}
206		− if (desc->flags & PIX_FMT_PAL \|\| desc->flags & PIX_FMT_PSEUDOPAL)
	206	+ if (desc->flags & AV_PIX_FMT_FLAG_PAL \|\| desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
207	207	avpriv_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt);
208	208
209	209	return ret;
@@ -247,11 +247,11 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], · 37 unmodified lines
247	247	{
248	248	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
249	249
250		− if (!desc \|\| desc->flags & PIX_FMT_HWACCEL)
	250	+ if (!desc \|\| desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
251	251	return;
252	252
253		− if (desc->flags & PIX_FMT_PAL \|\|
254		− desc->flags & PIX_FMT_PSEUDOPAL) {
	253	+ if (desc->flags & AV_PIX_FMT_FLAG_PAL \|\|
	254	+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
255	255	av_image_copy_plane(dst_data[0], dst_linesizes[0],
256	256	src_data[0], src_linesizes[0],
257	257	width, height);

libavutil/pixdesc.c+112−112

@@ -42,7 +42,7 @@ void av_read_image_line(uint16_t *dst, · 41 unmodified lines
42	42	int step = comp.step_minus1 + 1;
43	43	int flags = desc->flags;
44	44
45		− if (flags & PIX_FMT_BITSTREAM) {
	45	+ if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
46	46	int skip = x * step + comp.offset_plus1 - 1;
47	47	const uint8_t p = data[plane] + y linesize[plane] + (skip >> 3);
48	48	int shift = 8 - depth - (skip & 7);
@@ -62,11 +62,11 @@ void av_read_image_line(uint16_t *dst, · 13 unmodified lines
62	62	int is_8bit = shift + depth <= 8;
63	63
64	64	if (is_8bit)
65		− p += !!(flags & PIX_FMT_BE);
	65	+ p += !!(flags & AV_PIX_FMT_FLAG_BE);
66	66
67	67	while (w--) {
68	68	int val = is_8bit ? *p :
69		− flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p);
	69	+ flags & AV_PIX_FMT_FLAG_BE ? AV_RB16(p) : AV_RL16(p);
70	70	val = (val >> shift) & mask;
71	71	if (read_pal_component)
72	72	val = data[1][4 * val + c];
@@ -87,7 +87,7 @@ void av_write_image_line(const uint16_t *src, · 14 unmodified lines
87	87	int step = comp.step_minus1 + 1;
88	88	int flags = desc->flags;
89	89
90		− if (flags & PIX_FMT_BITSTREAM) {
	90	+ if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
91	91	int skip = x * step + comp.offset_plus1 - 1;
92	92	uint8_t p = data[plane] + y linesize[plane] + (skip >> 3);
93	93	int shift = 8 - depth - (skip & 7);
@@ -104,14 +104,14 @@ void av_write_image_line(const uint16_t *src, · 10 unmodified lines
104	104	x * step + comp.offset_plus1 - 1;
105	105
106	106	if (shift + depth <= 8) {
107		− p += !!(flags & PIX_FMT_BE);
	107	+ p += !!(flags & AV_PIX_FMT_FLAG_BE);
108	108	while (w--) {
109	109	p \|= (src++ << shift);
110	110	p += step;
111	111	}
112	112	} else {
113	113	while (w--) {
114		− if (flags & PIX_FMT_BE) {
	114	+ if (flags & AV_PIX_FMT_FLAG_BE) {
115	115	uint16_t val = AV_RB16(p) \| (*src++ << shift);
116	116	AV_WB16(p, val);
117	117	} else {
@@ -138,7 +138,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 20 unmodified lines
138	138	{ 1, 0, 1, 0, 7 }, /* U */
139	139	{ 2, 0, 1, 0, 7 }, /* V */
140	140	},
141		− .flags = PIX_FMT_PLANAR,
	141	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
142	142	},
143	143	[AV_PIX_FMT_YUYV422] = {
144	144	.name = "yuyv422",
@@ -161,7 +161,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 16 unmodified lines
161	161	{ 0, 2, 2, 0, 7 }, /* G */
162	162	{ 0, 2, 3, 0, 7 }, /* B */
163	163	},
164		− .flags = PIX_FMT_RGB,
	164	+ .flags = AV_PIX_FMT_FLAG_RGB,
165	165	},
166	166	[AV_PIX_FMT_BGR24] = {
167	167	.name = "bgr24",
@@ -173,7 +173,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
173	173	{ 0, 2, 2, 0, 7 }, /* G */
174	174	{ 0, 2, 3, 0, 7 }, /* R */
175	175	},
176		− .flags = PIX_FMT_RGB,
	176	+ .flags = AV_PIX_FMT_FLAG_RGB,
177	177	},
178	178	[AV_PIX_FMT_YUV422P] = {
179	179	.name = "yuv422p",
@@ -185,7 +185,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
185	185	{ 1, 0, 1, 0, 7 }, /* U */
186	186	{ 2, 0, 1, 0, 7 }, /* V */
187	187	},
188		− .flags = PIX_FMT_PLANAR,
	188	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
189	189	},
190	190	[AV_PIX_FMT_YUV444P] = {
191	191	.name = "yuv444p",
@@ -197,7 +197,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
197	197	{ 1, 0, 1, 0, 7 }, /* U */
198	198	{ 2, 0, 1, 0, 7 }, /* V */
199	199	},
200		− .flags = PIX_FMT_PLANAR,
	200	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
201	201	},
202	202	[AV_PIX_FMT_YUV410P] = {
203	203	.name = "yuv410p",
@@ -209,7 +209,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
209	209	{ 1, 0, 1, 0, 7 }, /* U */
210	210	{ 2, 0, 1, 0, 7 }, /* V */
211	211	},
212		− .flags = PIX_FMT_PLANAR,
	212	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
213	213	},
214	214	[AV_PIX_FMT_YUV411P] = {
215	215	.name = "yuv411p",
@@ -221,7 +221,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
221	221	{ 1, 0, 1, 0, 7 }, /* U */
222	222	{ 2, 0, 1, 0, 7 }, /* V */
223	223	},
224		− .flags = PIX_FMT_PLANAR,
	224	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
225	225	},
226	226	[AV_PIX_FMT_GRAY8] = {
227	227	.name = "gray",
@@ -240,7 +240,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 12 unmodified lines
240	240	.comp = {
241	241	{ 0, 0, 1, 0, 0 }, /* Y */
242	242	},
243		− .flags = PIX_FMT_BITSTREAM,
	243	+ .flags = AV_PIX_FMT_FLAG_BITSTREAM,
244	244	},
245	245	[AV_PIX_FMT_MONOBLACK] = {
246	246	.name = "monob",
@@ -250,7 +250,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
250	250	.comp = {
251	251	{ 0, 0, 1, 7, 0 }, /* Y */
252	252	},
253		− .flags = PIX_FMT_BITSTREAM,
	253	+ .flags = AV_PIX_FMT_FLAG_BITSTREAM,
254	254	},
255	255	[AV_PIX_FMT_PAL8] = {
256	256	.name = "pal8",
@@ -260,7 +260,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
260	260	.comp = {
261	261	{ 0, 0, 1, 0, 7 },
262	262	},
263		− .flags = PIX_FMT_PAL,
	263	+ .flags = AV_PIX_FMT_FLAG_PAL,
264	264	},
265	265	[AV_PIX_FMT_YUVJ420P] = {
266	266	.name = "yuvj420p",
@@ -272,7 +272,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
272	272	{ 1, 0, 1, 0, 7 }, /* U */
273	273	{ 2, 0, 1, 0, 7 }, /* V */
274	274	},
275		− .flags = PIX_FMT_PLANAR,
	275	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
276	276	},
277	277	[AV_PIX_FMT_YUVJ422P] = {
278	278	.name = "yuvj422p",
@@ -284,7 +284,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
284	284	{ 1, 0, 1, 0, 7 }, /* U */
285	285	{ 2, 0, 1, 0, 7 }, /* V */
286	286	},
287		− .flags = PIX_FMT_PLANAR,
	287	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
288	288	},
289	289	[AV_PIX_FMT_YUVJ444P] = {
290	290	.name = "yuvj444p",
@@ -296,15 +296,15 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
296	296	{1, 0, 1, 0, 7}, /* U */
297	297	{2, 0, 1, 0, 7}, /* V */
298	298	},
299		− .flags = PIX_FMT_PLANAR,
	299	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
300	300	},
301	301	[AV_PIX_FMT_XVMC_MPEG2_MC] = {
302	302	.name = "xvmcmc",
303		− .flags = PIX_FMT_HWACCEL,
	303	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
304	304	},
305	305	[AV_PIX_FMT_XVMC_MPEG2_IDCT] = {
306	306	.name = "xvmcidct",
307		− .flags = PIX_FMT_HWACCEL,
	307	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
308	308	},
309	309	[AV_PIX_FMT_UYVY422] = {
310	310	.name = "uyvy422",
@@ -338,7 +338,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 27 unmodified lines
338	338	{ 0, 0, 1, 3, 2 }, /* G */
339	339	{ 0, 0, 1, 0, 2 }, /* R */
340	340	},
341		− .flags = PIX_FMT_RGB \| PIX_FMT_PSEUDOPAL,
	341	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
342	342	},
343	343	[AV_PIX_FMT_BGR4] = {
344	344	.name = "bgr4",
@@ -350,7 +350,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
350	350	{ 0, 3, 2, 0, 1 }, /* G */
351	351	{ 0, 3, 4, 0, 0 }, /* R */
352	352	},
353		− .flags = PIX_FMT_BITSTREAM \| PIX_FMT_RGB,
	353	+ .flags = AV_PIX_FMT_FLAG_BITSTREAM \| AV_PIX_FMT_FLAG_RGB,
354	354	},
355	355	[AV_PIX_FMT_BGR4_BYTE] = {
356	356	.name = "bgr4_byte",
@@ -362,7 +362,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
362	362	{ 0, 0, 1, 1, 1 }, /* G */
363	363	{ 0, 0, 1, 0, 0 }, /* R */
364	364	},
365		− .flags = PIX_FMT_RGB \| PIX_FMT_PSEUDOPAL,
	365	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
366	366	},
367	367	[AV_PIX_FMT_RGB8] = {
368	368	.name = "rgb8",
@@ -374,7 +374,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
374	374	{ 0, 0, 1, 3, 2 }, /* G */
375	375	{ 0, 0, 1, 0, 2 }, /* B */
376	376	},
377		− .flags = PIX_FMT_RGB \| PIX_FMT_PSEUDOPAL,
	377	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
378	378	},
379	379	[AV_PIX_FMT_RGB4] = {
380	380	.name = "rgb4",
@@ -386,7 +386,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
386	386	{ 0, 3, 2, 0, 1 }, /* G */
387	387	{ 0, 3, 4, 0, 0 }, /* B */
388	388	},
389		− .flags = PIX_FMT_BITSTREAM \| PIX_FMT_RGB,
	389	+ .flags = AV_PIX_FMT_FLAG_BITSTREAM \| AV_PIX_FMT_FLAG_RGB,
390	390	},
391	391	[AV_PIX_FMT_RGB4_BYTE] = {
392	392	.name = "rgb4_byte",
@@ -398,7 +398,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
398	398	{ 0, 0, 1, 1, 1 }, /* G */
399	399	{ 0, 0, 1, 0, 0 }, /* B */
400	400	},
401		− .flags = PIX_FMT_RGB \| PIX_FMT_PSEUDOPAL,
	401	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
402	402	},
403	403	[AV_PIX_FMT_NV12] = {
404	404	.name = "nv12",
@@ -410,7 +410,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
410	410	{ 1, 1, 1, 0, 7 }, /* U */
411	411	{ 1, 1, 2, 0, 7 }, /* V */
412	412	},
413		− .flags = PIX_FMT_PLANAR,
	413	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
414	414	},
415	415	[AV_PIX_FMT_NV21] = {
416	416	.name = "nv21",
@@ -422,7 +422,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
422	422	{ 1, 1, 1, 0, 7 }, /* V */
423	423	{ 1, 1, 2, 0, 7 }, /* U */
424	424	},
425		− .flags = PIX_FMT_PLANAR,
	425	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
426	426	},
427	427	[AV_PIX_FMT_ARGB] = {
428	428	.name = "argb",
@@ -435,7 +435,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
435	435	{ 0, 3, 3, 0, 7 }, /* G */
436	436	{ 0, 3, 4, 0, 7 }, /* B */
437	437	},
438		− .flags = PIX_FMT_RGB \| PIX_FMT_ALPHA,
	438	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
439	439	},
440	440	[AV_PIX_FMT_RGBA] = {
441	441	.name = "rgba",
@@ -448,7 +448,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
448	448	{ 0, 3, 3, 0, 7 }, /* B */
449	449	{ 0, 3, 4, 0, 7 }, /* A */
450	450	},
451		− .flags = PIX_FMT_RGB \| PIX_FMT_ALPHA,
	451	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
452	452	},
453	453	[AV_PIX_FMT_ABGR] = {
454	454	.name = "abgr",
@@ -461,7 +461,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
461	461	{ 0, 3, 3, 0, 7 }, /* G */
462	462	{ 0, 3, 4, 0, 7 }, /* R */
463	463	},
464		− .flags = PIX_FMT_RGB \| PIX_FMT_ALPHA,
	464	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
465	465	},
466	466	[AV_PIX_FMT_BGRA] = {
467	467	.name = "bgra",
@@ -474,7 +474,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
474	474	{ 0, 3, 3, 0, 7 }, /* R */
475	475	{ 0, 3, 4, 0, 7 }, /* A */
476	476	},
477		− .flags = PIX_FMT_RGB \| PIX_FMT_ALPHA,
	477	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
478	478	},
479	479	[AV_PIX_FMT_GRAY16BE] = {
480	480	.name = "gray16be",
@@ -484,7 +484,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
484	484	.comp = {
485	485	{ 0, 1, 1, 0, 15 }, /* Y */
486	486	},
487		− .flags = PIX_FMT_BE,
	487	+ .flags = AV_PIX_FMT_FLAG_BE,
488	488	},
489	489	[AV_PIX_FMT_GRAY16LE] = {
490	490	.name = "gray16le",
@@ -505,7 +505,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 14 unmodified lines
505	505	{ 1, 0, 1, 0, 7 }, /* U */
506	506	{ 2, 0, 1, 0, 7 }, /* V */
507	507	},
508		− .flags = PIX_FMT_PLANAR,
	508	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
509	509	},
510	510	[AV_PIX_FMT_YUVJ440P] = {
511	511	.name = "yuvj440p",
@@ -517,7 +517,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
517	517	{ 1, 0, 1, 0, 7 }, /* U */
518	518	{ 2, 0, 1, 0, 7 }, /* V */
519	519	},
520		− .flags = PIX_FMT_PLANAR,
	520	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
521	521	},
522	522	[AV_PIX_FMT_YUVA420P] = {
523	523	.name = "yuva420p",
@@ -530,7 +530,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
530	530	{ 2, 0, 1, 0, 7 }, /* V */
531	531	{ 3, 0, 1, 0, 7 }, /* A */
532	532	},
533		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	533	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
534	534	},
535	535	[AV_PIX_FMT_YUVA422P] = {
536	536	.name = "yuva422p",
@@ -543,7 +543,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
543	543	{ 2, 0, 1, 0, 7 }, /* V */
544	544	{ 3, 0, 1, 0, 7 }, /* A */
545	545	},
546		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	546	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
547	547	},
548	548	[AV_PIX_FMT_YUVA444P] = {
549	549	.name = "yuva444p",
@@ -556,7 +556,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
556	556	{ 2, 0, 1, 0, 7 }, /* V */
557	557	{ 3, 0, 1, 0, 7 }, /* A */
558	558	},
559		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	559	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
560	560	},
561	561	[AV_PIX_FMT_YUVA420P9BE] = {
562	562	.name = "yuva420p9be",
@@ -569,7 +569,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
569	569	{ 2, 1, 1, 0, 8 }, /* V */
570	570	{ 3, 1, 1, 0, 8 }, /* A */
571	571	},
572		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	572	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
573	573	},
574	574	[AV_PIX_FMT_YUVA420P9LE] = {
575	575	.name = "yuva420p9le",
@@ -582,7 +582,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
582	582	{ 2, 1, 1, 0, 8 }, /* V */
583	583	{ 3, 1, 1, 0, 8 }, /* A */
584	584	},
585		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	585	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
586	586	},
587	587	[AV_PIX_FMT_YUVA422P9BE] = {
588	588	.name = "yuva422p9be",
@@ -595,7 +595,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
595	595	{ 2, 1, 1, 0, 8 }, /* V */
596	596	{ 3, 1, 1, 0, 8 }, /* A */
597	597	},
598		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	598	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
599	599	},
600	600	[AV_PIX_FMT_YUVA422P9LE] = {
601	601	.name = "yuva422p9le",
@@ -608,7 +608,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
608	608	{ 2, 1, 1, 0, 8 }, /* V */
609	609	{ 3, 1, 1, 0, 8 }, /* A */
610	610	},
611		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	611	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
612	612	},
613	613	[AV_PIX_FMT_YUVA444P9BE] = {
614	614	.name = "yuva444p9be",
@@ -621,7 +621,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
621	621	{ 2, 1, 1, 0, 8 }, /* V */
622	622	{ 3, 1, 1, 0, 8 }, /* A */
623	623	},
624		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	624	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
625	625	},
626	626	[AV_PIX_FMT_YUVA444P9LE] = {
627	627	.name = "yuva444p9le",
@@ -634,7 +634,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
634	634	{ 2, 1, 1, 0, 8 }, /* V */
635	635	{ 3, 1, 1, 0, 8 }, /* A */
636	636	},
637		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	637	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
638	638	},
639	639	[AV_PIX_FMT_YUVA420P10BE] = {
640	640	.name = "yuva420p10be",
@@ -647,7 +647,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
647	647	{ 2, 1, 1, 0, 9 }, /* V */
648	648	{ 3, 1, 1, 0, 9 }, /* A */
649	649	},
650		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	650	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
651	651	},
652	652	[AV_PIX_FMT_YUVA420P10LE] = {
653	653	.name = "yuva420p10le",
@@ -660,7 +660,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
660	660	{ 2, 1, 1, 0, 9 }, /* V */
661	661	{ 3, 1, 1, 0, 9 }, /* A */
662	662	},
663		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	663	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
664	664	},
665	665	[AV_PIX_FMT_YUVA422P10BE] = {
666	666	.name = "yuva422p10be",
@@ -673,7 +673,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
673	673	{ 2, 1, 1, 0, 9 }, /* V */
674	674	{ 3, 1, 1, 0, 9 }, /* A */
675	675	},
676		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	676	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
677	677	},
678	678	[AV_PIX_FMT_YUVA422P10LE] = {
679	679	.name = "yuva422p10le",
@@ -686,7 +686,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
686	686	{ 2, 1, 1, 0, 9 }, /* V */
687	687	{ 3, 1, 1, 0, 9 }, /* A */
688	688	},
689		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	689	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
690	690	},
691	691	[AV_PIX_FMT_YUVA444P10BE] = {
692	692	.name = "yuva444p10be",
@@ -699,7 +699,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
699	699	{ 2, 1, 1, 0, 9 }, /* V */
700	700	{ 3, 1, 1, 0, 9 }, /* A */
701	701	},
702		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	702	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
703	703	},
704	704	[AV_PIX_FMT_YUVA444P10LE] = {
705	705	.name = "yuva444p10le",
@@ -712,7 +712,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
712	712	{ 2, 1, 1, 0, 9 }, /* V */
713	713	{ 3, 1, 1, 0, 9 }, /* A */
714	714	},
715		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	715	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
716	716	},
717	717	[AV_PIX_FMT_YUVA420P16BE] = {
718	718	.name = "yuva420p16be",
@@ -725,7 +725,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
725	725	{ 2, 1, 1, 0, 15 }, /* V */
726	726	{ 3, 1, 1, 0, 15 }, /* A */
727	727	},
728		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	728	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
729	729	},
730	730	[AV_PIX_FMT_YUVA420P16LE] = {
731	731	.name = "yuva420p16le",
@@ -738,7 +738,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
738	738	{ 2, 1, 1, 0, 15 }, /* V */
739	739	{ 3, 1, 1, 0, 15 }, /* A */
740	740	},
741		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	741	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
742	742	},
743	743	[AV_PIX_FMT_YUVA422P16BE] = {
744	744	.name = "yuva422p16be",
@@ -751,7 +751,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
751	751	{ 2, 1, 1, 0, 15 }, /* V */
752	752	{ 3, 1, 1, 0, 15 }, /* A */
753	753	},
754		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	754	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
755	755	},
756	756	[AV_PIX_FMT_YUVA422P16LE] = {
757	757	.name = "yuva422p16le",
@@ -764,7 +764,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
764	764	{ 2, 1, 1, 0, 15 }, /* V */
765	765	{ 3, 1, 1, 0, 15 }, /* A */
766	766	},
767		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	767	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
768	768	},
769	769	[AV_PIX_FMT_YUVA444P16BE] = {
770	770	.name = "yuva444p16be",
@@ -777,7 +777,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
777	777	{ 2, 1, 1, 0, 15 }, /* V */
778	778	{ 3, 1, 1, 0, 15 }, /* A */
779	779	},
780		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	780	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
781	781	},
782	782	[AV_PIX_FMT_YUVA444P16LE] = {
783	783	.name = "yuva444p16le",
@@ -790,43 +790,43 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
790	790	{ 2, 1, 1, 0, 15 }, /* V */
791	791	{ 3, 1, 1, 0, 15 }, /* A */
792	792	},
793		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	793	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
794	794	},
795	795	[AV_PIX_FMT_VDPAU_H264] = {
796	796	.name = "vdpau_h264",
797	797	.log2_chroma_w = 1,
798	798	.log2_chroma_h = 1,
799		− .flags = PIX_FMT_HWACCEL,
	799	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
800	800	},
801	801	[AV_PIX_FMT_VDPAU_MPEG1] = {
802	802	.name = "vdpau_mpeg1",
803	803	.log2_chroma_w = 1,
804	804	.log2_chroma_h = 1,
805		− .flags = PIX_FMT_HWACCEL,
	805	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
806	806	},
807	807	[AV_PIX_FMT_VDPAU_MPEG2] = {
808	808	.name = "vdpau_mpeg2",
809	809	.log2_chroma_w = 1,
810	810	.log2_chroma_h = 1,
811		− .flags = PIX_FMT_HWACCEL,
	811	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
812	812	},
813	813	[AV_PIX_FMT_VDPAU_WMV3] = {
814	814	.name = "vdpau_wmv3",
815	815	.log2_chroma_w = 1,
816	816	.log2_chroma_h = 1,
817		− .flags = PIX_FMT_HWACCEL,
	817	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
818	818	},
819	819	[AV_PIX_FMT_VDPAU_VC1] = {
820	820	.name = "vdpau_vc1",
821	821	.log2_chroma_w = 1,
822	822	.log2_chroma_h = 1,
823		− .flags = PIX_FMT_HWACCEL,
	823	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
824	824	},
825	825	[AV_PIX_FMT_VDPAU_MPEG4] = {
826	826	.name = "vdpau_mpeg4",
827	827	.log2_chroma_w = 1,
828	828	.log2_chroma_h = 1,
829		− .flags = PIX_FMT_HWACCEL,
	829	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
830	830	},
831	831	[AV_PIX_FMT_RGB48BE] = {
832	832	.name = "rgb48be",
@@ -838,7 +838,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
838	838	{ 0, 5, 3, 0, 15 }, /* G */
839	839	{ 0, 5, 5, 0, 15 }, /* B */
840	840	},
841		− .flags = PIX_FMT_RGB \| PIX_FMT_BE,
	841	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_BE,
842	842	},
843	843	[AV_PIX_FMT_RGB48LE] = {
844	844	.name = "rgb48le",
@@ -850,7 +850,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
850	850	{ 0, 5, 3, 0, 15 }, /* G */
851	851	{ 0, 5, 5, 0, 15 }, /* B */
852	852	},
853		− .flags = PIX_FMT_RGB,
	853	+ .flags = AV_PIX_FMT_FLAG_RGB,
854	854	},
855	855	[AV_PIX_FMT_RGB565BE] = {
856	856	.name = "rgb565be",
@@ -862,7 +862,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
862	862	{ 0, 1, 1, 5, 5 }, /* G */
863	863	{ 0, 1, 1, 0, 4 }, /* B */
864	864	},
865		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	865	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
866	866	},
867	867	[AV_PIX_FMT_RGB565LE] = {
868	868	.name = "rgb565le",
@@ -874,7 +874,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
874	874	{ 0, 1, 1, 5, 5 }, /* G */
875	875	{ 0, 1, 1, 0, 4 }, /* B */
876	876	},
877		− .flags = PIX_FMT_RGB,
	877	+ .flags = AV_PIX_FMT_FLAG_RGB,
878	878	},
879	879	[AV_PIX_FMT_RGB555BE] = {
880	880	.name = "rgb555be",
@@ -886,7 +886,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
886	886	{ 0, 1, 1, 5, 4 }, /* G */
887	887	{ 0, 1, 1, 0, 4 }, /* B */
888	888	},
889		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	889	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
890	890	},
891	891	[AV_PIX_FMT_RGB555LE] = {
892	892	.name = "rgb555le",
@@ -898,7 +898,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
898	898	{ 0, 1, 1, 5, 4 }, /* G */
899	899	{ 0, 1, 1, 0, 4 }, /* B */
900	900	},
901		− .flags = PIX_FMT_RGB,
	901	+ .flags = AV_PIX_FMT_FLAG_RGB,
902	902	},
903	903	[AV_PIX_FMT_RGB444BE] = {
904	904	.name = "rgb444be",
@@ -910,7 +910,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
910	910	{ 0, 1, 1, 4, 3 }, /* G */
911	911	{ 0, 1, 1, 0, 3 }, /* B */
912	912	},
913		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	913	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
914	914	},
915	915	[AV_PIX_FMT_RGB444LE] = {
916	916	.name = "rgb444le",
@@ -922,7 +922,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
922	922	{ 0, 1, 1, 4, 3 }, /* G */
923	923	{ 0, 1, 1, 0, 3 }, /* B */
924	924	},
925		− .flags = PIX_FMT_RGB,
	925	+ .flags = AV_PIX_FMT_FLAG_RGB,
926	926	},
927	927	[AV_PIX_FMT_BGR48BE] = {
928	928	.name = "bgr48be",
@@ -934,7 +934,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
934	934	{ 0, 5, 3, 0, 15 }, /* G */
935	935	{ 0, 5, 5, 0, 15 }, /* R */
936	936	},
937		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	937	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
938	938	},
939	939	[AV_PIX_FMT_BGR48LE] = {
940	940	.name = "bgr48le",
@@ -946,7 +946,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
946	946	{ 0, 5, 3, 0, 15 }, /* G */
947	947	{ 0, 5, 5, 0, 15 }, /* R */
948	948	},
949		− .flags = PIX_FMT_RGB,
	949	+ .flags = AV_PIX_FMT_FLAG_RGB,
950	950	},
951	951	[AV_PIX_FMT_BGR565BE] = {
952	952	.name = "bgr565be",
@@ -958,7 +958,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
958	958	{ 0, 1, 1, 5, 5 }, /* G */
959	959	{ 0, 1, 1, 0, 4 }, /* R */
960	960	},
961		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	961	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
962	962	},
963	963	[AV_PIX_FMT_BGR565LE] = {
964	964	.name = "bgr565le",
@@ -970,7 +970,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
970	970	{ 0, 1, 1, 5, 5 }, /* G */
971	971	{ 0, 1, 1, 0, 4 }, /* R */
972	972	},
973		− .flags = PIX_FMT_RGB,
	973	+ .flags = AV_PIX_FMT_FLAG_RGB,
974	974	},
975	975	[AV_PIX_FMT_BGR555BE] = {
976	976	.name = "bgr555be",
@@ -982,7 +982,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
982	982	{ 0, 1, 1, 5, 4 }, /* G */
983	983	{ 0, 1, 1, 0, 4 }, /* R */
984	984	},
985		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	985	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
986	986	},
987	987	[AV_PIX_FMT_BGR555LE] = {
988	988	.name = "bgr555le",
@@ -994,7 +994,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
994	994	{ 0, 1, 1, 5, 4 }, /* G */
995	995	{ 0, 1, 1, 0, 4 }, /* R */
996	996	},
997		− .flags = PIX_FMT_RGB,
	997	+ .flags = AV_PIX_FMT_FLAG_RGB,
998	998	},
999	999	[AV_PIX_FMT_BGR444BE] = {
1000	1000	.name = "bgr444be",
@@ -1006,7 +1006,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1006	1006	{ 0, 1, 1, 4, 3 }, /* G */
1007	1007	{ 0, 1, 1, 0, 3 }, /* R */
1008	1008	},
1009		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	1009	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1010	1010	},
1011	1011	[AV_PIX_FMT_BGR444LE] = {
1012	1012	.name = "bgr444le",
@@ -1018,31 +1018,31 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1018	1018	{ 0, 1, 1, 4, 3 }, /* G */
1019	1019	{ 0, 1, 1, 0, 3 }, /* R */
1020	1020	},
1021		− .flags = PIX_FMT_RGB,
	1021	+ .flags = AV_PIX_FMT_FLAG_RGB,
1022	1022	},
1023	1023	[AV_PIX_FMT_VAAPI_MOCO] = {
1024	1024	.name = "vaapi_moco",
1025	1025	.log2_chroma_w = 1,
1026	1026	.log2_chroma_h = 1,
1027		− .flags = PIX_FMT_HWACCEL,
	1027	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1028	1028	},
1029	1029	[AV_PIX_FMT_VAAPI_IDCT] = {
1030	1030	.name = "vaapi_idct",
1031	1031	.log2_chroma_w = 1,
1032	1032	.log2_chroma_h = 1,
1033		− .flags = PIX_FMT_HWACCEL,
	1033	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1034	1034	},
1035	1035	[AV_PIX_FMT_VAAPI_VLD] = {
1036	1036	.name = "vaapi_vld",
1037	1037	.log2_chroma_w = 1,
1038	1038	.log2_chroma_h = 1,
1039		− .flags = PIX_FMT_HWACCEL,
	1039	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1040	1040	},
1041	1041	[AV_PIX_FMT_VDA_VLD] = {
1042	1042	.name = "vda_vld",
1043	1043	.log2_chroma_w = 1,
1044	1044	.log2_chroma_h = 1,
1045		− .flags = PIX_FMT_HWACCEL,
	1045	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1046	1046	},
1047	1047	[AV_PIX_FMT_YUV420P9LE] = {
1048	1048	.name = "yuv420p9le",
@@ -1054,7 +1054,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1054	1054	{ 1, 1, 1, 0, 8 }, /* U */
1055	1055	{ 2, 1, 1, 0, 8 }, /* V */
1056	1056	},
1057		− .flags = PIX_FMT_PLANAR,
	1057	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1058	1058	},
1059	1059	[AV_PIX_FMT_YUV420P9BE] = {
1060	1060	.name = "yuv420p9be",
@@ -1066,7 +1066,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1066	1066	{ 1, 1, 1, 0, 8 }, /* U */
1067	1067	{ 2, 1, 1, 0, 8 }, /* V */
1068	1068	},
1069		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1069	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1070	1070	},
1071	1071	[AV_PIX_FMT_YUV420P10LE] = {
1072	1072	.name = "yuv420p10le",
@@ -1078,7 +1078,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1078	1078	{ 1, 1, 1, 0, 9 }, /* U */
1079	1079	{ 2, 1, 1, 0, 9 }, /* V */
1080	1080	},
1081		− .flags = PIX_FMT_PLANAR,
	1081	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1082	1082	},
1083	1083	[AV_PIX_FMT_YUV420P10BE] = {
1084	1084	.name = "yuv420p10be",
@@ -1090,7 +1090,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1090	1090	{ 1, 1, 1, 0, 9 }, /* U */
1091	1091	{ 2, 1, 1, 0, 9 }, /* V */
1092	1092	},
1093		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1093	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1094	1094	},
1095	1095	[AV_PIX_FMT_YUV420P16LE] = {
1096	1096	.name = "yuv420p16le",
@@ -1102,7 +1102,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1102	1102	{ 1, 1, 1, 0, 15 }, /* U */
1103	1103	{ 2, 1, 1, 0, 15 }, /* V */
1104	1104	},
1105		− .flags = PIX_FMT_PLANAR,
	1105	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1106	1106	},
1107	1107	[AV_PIX_FMT_YUV420P16BE] = {
1108	1108	.name = "yuv420p16be",
@@ -1114,7 +1114,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1114	1114	{ 1, 1, 1, 0, 15 }, /* U */
1115	1115	{ 2, 1, 1, 0, 15 }, /* V */
1116	1116	},
1117		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1117	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1118	1118	},
1119	1119	[AV_PIX_FMT_YUV422P9LE] = {
1120	1120	.name = "yuv422p9le",
@@ -1126,7 +1126,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1126	1126	{ 1, 1, 1, 0, 8 }, /* U */
1127	1127	{ 2, 1, 1, 0, 8 }, /* V */
1128	1128	},
1129		− .flags = PIX_FMT_PLANAR,
	1129	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1130	1130	},
1131	1131	[AV_PIX_FMT_YUV422P9BE] = {
1132	1132	.name = "yuv422p9be",
@@ -1138,7 +1138,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1138	1138	{ 1, 1, 1, 0, 8 }, /* U */
1139	1139	{ 2, 1, 1, 0, 8 }, /* V */
1140	1140	},
1141		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1141	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1142	1142	},
1143	1143	[AV_PIX_FMT_YUV422P10LE] = {
1144	1144	.name = "yuv422p10le",
@@ -1150,7 +1150,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1150	1150	{ 1, 1, 1, 0, 9 }, /* U */
1151	1151	{ 2, 1, 1, 0, 9 }, /* V */
1152	1152	},
1153		− .flags = PIX_FMT_PLANAR,
	1153	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1154	1154	},
1155	1155	[AV_PIX_FMT_YUV422P10BE] = {
1156	1156	.name = "yuv422p10be",
@@ -1162,7 +1162,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1162	1162	{ 1, 1, 1, 0, 9 }, /* U */
1163	1163	{ 2, 1, 1, 0, 9 }, /* V */
1164	1164	},
1165		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1165	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1166	1166	},
1167	1167	[AV_PIX_FMT_YUV422P16LE] = {
1168	1168	.name = "yuv422p16le",
@@ -1174,7 +1174,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1174	1174	{ 1, 1, 1, 0, 15 }, /* U */
1175	1175	{ 2, 1, 1, 0, 15 }, /* V */
1176	1176	},
1177		− .flags = PIX_FMT_PLANAR,
	1177	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1178	1178	},
1179	1179	[AV_PIX_FMT_YUV422P16BE] = {
1180	1180	.name = "yuv422p16be",
@@ -1186,7 +1186,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1186	1186	{ 1, 1, 1, 0, 15 }, /* U */
1187	1187	{ 2, 1, 1, 0, 15 }, /* V */
1188	1188	},
1189		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1189	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1190	1190	},
1191	1191	[AV_PIX_FMT_YUV444P16LE] = {
1192	1192	.name = "yuv444p16le",
@@ -1198,7 +1198,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1198	1198	{ 1, 1, 1, 0, 15 }, /* U */
1199	1199	{ 2, 1, 1, 0, 15 }, /* V */
1200	1200	},
1201		− .flags = PIX_FMT_PLANAR,
	1201	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1202	1202	},
1203	1203	[AV_PIX_FMT_YUV444P16BE] = {
1204	1204	.name = "yuv444p16be",
@@ -1210,7 +1210,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1210	1210	{ 1, 1, 1, 0, 15 }, /* U */
1211	1211	{ 2, 1, 1, 0, 15 }, /* V */
1212	1212	},
1213		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1213	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1214	1214	},
1215	1215	[AV_PIX_FMT_YUV444P10LE] = {
1216	1216	.name = "yuv444p10le",
@@ -1222,7 +1222,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1222	1222	{ 1, 1, 1, 0, 9 }, /* U */
1223	1223	{ 2, 1, 1, 0, 9 }, /* V */
1224	1224	},
1225		− .flags = PIX_FMT_PLANAR,
	1225	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1226	1226	},
1227	1227	[AV_PIX_FMT_YUV444P10BE] = {
1228	1228	.name = "yuv444p10be",
@@ -1234,7 +1234,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1234	1234	{ 1, 1, 1, 0, 9 }, /* U */
1235	1235	{ 2, 1, 1, 0, 9 }, /* V */
1236	1236	},
1237		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1237	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1238	1238	},
1239	1239	[AV_PIX_FMT_YUV444P9LE] = {
1240	1240	.name = "yuv444p9le",
@@ -1246,7 +1246,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1246	1246	{ 1, 1, 1, 0, 8 }, /* U */
1247	1247	{ 2, 1, 1, 0, 8 }, /* V */
1248	1248	},
1249		− .flags = PIX_FMT_PLANAR,
	1249	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1250	1250	},
1251	1251	[AV_PIX_FMT_YUV444P9BE] = {
1252	1252	.name = "yuv444p9be",
@@ -1258,13 +1258,13 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1258	1258	{ 1, 1, 1, 0, 8 }, /* U */
1259	1259	{ 2, 1, 1, 0, 8 }, /* V */
1260	1260	},
1261		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1261	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1262	1262	},
1263	1263	[AV_PIX_FMT_DXVA2_VLD] = {
1264	1264	.name = "dxva2_vld",
1265	1265	.log2_chroma_w = 1,
1266	1266	.log2_chroma_h = 1,
1267		− .flags = PIX_FMT_HWACCEL,
	1267	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1268	1268	},
1269	1269	[AV_PIX_FMT_Y400A] = {
1270	1270	.name = "y400a",
@@ -1273,7 +1273,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
1273	1273	{ 0, 1, 1, 0, 7 }, /* Y */
1274	1274	{ 0, 1, 2, 0, 7 }, /* A */
1275	1275	},
1276		− .flags = PIX_FMT_ALPHA,
	1276	+ .flags = AV_PIX_FMT_FLAG_ALPHA,
1277	1277	},
1278	1278	[AV_PIX_FMT_GBRP] = {
1279	1279	.name = "gbrp",
@@ -1285,7 +1285,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1285	1285	{ 1, 0, 1, 0, 7 }, /* B */
1286	1286	{ 2, 0, 1, 0, 7 }, /* R */
1287	1287	},
1288		− .flags = PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1288	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1289	1289	},
1290	1290	[AV_PIX_FMT_GBRP9LE] = {
1291	1291	.name = "gbrp9le",
@@ -1297,7 +1297,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1297	1297	{ 1, 1, 1, 0, 8 }, /* B */
1298	1298	{ 2, 1, 1, 0, 8 }, /* R */
1299	1299	},
1300		− .flags = PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1300	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1301	1301	},
1302	1302	[AV_PIX_FMT_GBRP9BE] = {
1303	1303	.name = "gbrp9be",
@@ -1309,7 +1309,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1309	1309	{ 1, 1, 1, 0, 8 }, /* B */
1310	1310	{ 2, 1, 1, 0, 8 }, /* R */
1311	1311	},
1312		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1312	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1313	1313	},
1314	1314	[AV_PIX_FMT_GBRP10LE] = {
1315	1315	.name = "gbrp10le",
@@ -1321,7 +1321,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1321	1321	{ 1, 1, 1, 0, 9 }, /* B */
1322	1322	{ 2, 1, 1, 0, 9 }, /* R */
1323	1323	},
1324		− .flags = PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1324	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1325	1325	},
1326	1326	[AV_PIX_FMT_GBRP10BE] = {
1327	1327	.name = "gbrp10be",
@@ -1333,7 +1333,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1333	1333	{ 1, 1, 1, 0, 9 }, /* B */
1334	1334	{ 2, 1, 1, 0, 9 }, /* R */
1335	1335	},
1336		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1336	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1337	1337	},
1338	1338	[AV_PIX_FMT_GBRP16LE] = {
1339	1339	.name = "gbrp16le",
@@ -1345,7 +1345,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1345	1345	{ 1, 1, 1, 0, 15 }, /* B */
1346	1346	{ 2, 1, 1, 0, 15 }, /* R */
1347	1347	},
1348		− .flags = PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1348	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1349	1349	},
1350	1350	[AV_PIX_FMT_GBRP16BE] = {
1351	1351	.name = "gbrp16be",
@@ -1357,13 +1357,13 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1357	1357	{ 1, 1, 1, 0, 15 }, /* B */
1358	1358	{ 2, 1, 1, 0, 15 }, /* R */
1359	1359	},
1360		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1360	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1361	1361	},
1362	1362	[AV_PIX_FMT_VDPAU] = {
1363	1363	.name = "vdpau",
1364	1364	.log2_chroma_w = 1,
1365	1365	.log2_chroma_h = 1,
1366		− .flags = PIX_FMT_HWACCEL,
	1366	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1367	1367	},
1368	1368	[AV_PIX_FMT_XYZ12LE] = {
1369	1369	.name = "xyz12le",
@@ -1387,7 +1387,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 17 unmodified lines
1387	1387	{ 0, 5, 3, 4, 11 }, /* Y */
1388	1388	{ 0, 5, 5, 4, 11 }, /* Z */
1389	1389	},
1390		− .flags = PIX_FMT_BE,
	1390	+ .flags = AV_PIX_FMT_FLAG_BE,
1391	1391	},
1392	1392	};
1393	1393

libavutil/pixdesc.h+42−9

@@ -83,21 +83,54 @@ typedef struct AVPixFmtDescriptor{ · 82 unmodified lines
83	83	AVComponentDescriptor comp[4];
84	84	}AVPixFmtDescriptor;
85	85
86		−#define PIX_FMT_BE 1 ///< Pixel format is big-endian.
87		−#define PIX_FMT_PAL 2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
88		−#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
89		−#define PIX_FMT_HWACCEL 8 ///< Pixel format is an HW accelerated format.
90		−#define PIX_FMT_PLANAR 16 ///< At least one pixel component is not in the first data plane
91		−#define PIX_FMT_RGB 32 ///< The pixel format contains RGB-like data (as opposed to YUV/grayscale)
	86	+/**
	87	+ * Pixel format is big-endian.
	88	+ */
	89	+#define AV_PIX_FMT_FLAG_BE (1 << 0)
	90	+/**
	91	+ * Pixel format has a palette in data[1], values are indexes in this palette.
	92	+ */
	93	+#define AV_PIX_FMT_FLAG_PAL (1 << 1)
	94	+/**
	95	+ * All values of a component are bit-wise packed end to end.
	96	+ */
	97	+#define AV_PIX_FMT_FLAG_BITSTREAM (1 << 2)
	98	+/**
	99	+ * Pixel format is an HW accelerated format.
	100	+ */
	101	+#define AV_PIX_FMT_FLAG_HWACCEL (1 << 3)
	102	+/**
	103	+ * At least one pixel component is not in the first data plane.
	104	+ */
	105	+#define AV_PIX_FMT_FLAG_PLANAR (1 << 4)
	106	+/**
	107	+ * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
	108	+ */
	109	+#define AV_PIX_FMT_FLAG_RGB (1 << 5)
92	110	/**
93	111	* The pixel format is "pseudo-paletted". This means that Libav treats it as
94	112	* paletted internally, but the palette is generated by the decoder and is not
95	113	* stored in the file.
96	114	*/
97		−#define PIX_FMT_PSEUDOPAL 64
98		−
99		−#define PIX_FMT_ALPHA 128 ///< The pixel format has an alpha channel
	115	+#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6)
	116	+/**
	117	+ * The pixel format has an alpha channel.
	118	+ */
	119	+#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
100	120
	121	+#if FF_API_PIX_FMT
	122	+/**
	123	+ * @deprecate use the AV_PIX_FMT_FLAG_* flags
	124	+ */
	125	+#define PIX_FMT_BE AV_PIX_FMT_FLAG_BE
	126	+#define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL
	127	+#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
	128	+#define PIX_FMT_HWACCEL AV_PIX_FMT_FLAG_HWACCEL
	129	+#define PIX_FMT_PLANAR AV_PIX_FMT_FLAG_PLANAR
	130	+#define PIX_FMT_RGB AV_PIX_FMT_FLAG_RGB
	131	+#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
	132	+#define PIX_FMT_ALPHA AV_PIX_FMT_FLAG_ALPHA
	133	+#endif
101	134
102	135	#if FF_API_PIX_FMT_DESC
103	136	/**

libavutil/version.h+2−2

@@ -37,8 +37,8 @@ · 36 unmodified lines
37	37	*/
38	38
39	39	#define LIBAVUTIL_VERSION_MAJOR 52
40		−#define LIBAVUTIL_VERSION_MINOR 10
41		−#define LIBAVUTIL_VERSION_MICRO 1
	40	+#define LIBAVUTIL_VERSION_MINOR 11
	41	+#define LIBAVUTIL_VERSION_MICRO 0
42	42
43	43	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
44	44	LIBAVUTIL_VERSION_MINOR, \

libswscale/swscale_internal.h+11−11

@@ -596,33 +596,33 @@ static av_always_inline int isBE(enum AVPixelFormat pix_fmt) · 595 unmodified lines
596	596	{
597	597	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
598	598	av_assert0(desc);
599		− return desc->flags & PIX_FMT_BE;
	599	+ return desc->flags & AV_PIX_FMT_FLAG_BE;
600	600	}
601	601
602	602	static av_always_inline int isYUV(enum AVPixelFormat pix_fmt)
603	603	{
604	604	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
605	605	av_assert0(desc);
606		− return !(desc->flags & PIX_FMT_RGB) && desc->nb_components >= 2;
	606	+ return !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2;
607	607	}
608	608
609	609	static av_always_inline int isPlanarYUV(enum AVPixelFormat pix_fmt)
610	610	{
611	611	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
612	612	av_assert0(desc);
613		− return ((desc->flags & PIX_FMT_PLANAR) && isYUV(pix_fmt));
	613	+ return ((desc->flags & AV_PIX_FMT_FLAG_PLANAR) && isYUV(pix_fmt));
614	614	}
615	615
616	616	static av_always_inline int isRGB(enum AVPixelFormat pix_fmt)
617	617	{
618	618	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
619	619	av_assert0(desc);
620		− return (desc->flags & PIX_FMT_RGB);
	620	+ return (desc->flags & AV_PIX_FMT_FLAG_RGB);
621	621	}
622	622
623	623	#if 0 // FIXME
624	624	#define isGray(x) \
625		− (!(av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) && \
	625	+ (!(av_pix_fmt_descriptors[x].flags & AV_PIX_FMT_FLAG_PAL) && \
626	626	av_pix_fmt_descriptors[x].nb_components <= 2)
627	627	#else
628	628	#define isGray(x) \
@@ -683,7 +683,7 @@ static av_always_inline int isPacked(enum AVPixelFormat pix_fmt) · 54 unmodified lines
683	683	{
684	684	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
685	685	av_assert0(desc);
686		− return ((desc->nb_components >= 2 && !(desc->flags & PIX_FMT_PLANAR)) \|\|
	686	+ return ((desc->nb_components >= 2 && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) \|\|
687	687	pix_fmt == AV_PIX_FMT_PAL8);
688	688	}
689	689
@@ -691,29 +691,29 @@ static av_always_inline int isPlanar(enum AVPixelFormat pix_fmt) · 1 unmodified line
691	691	{
692	692	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
693	693	av_assert0(desc);
694		− return (desc->nb_components >= 2 && (desc->flags & PIX_FMT_PLANAR));
	694	+ return (desc->nb_components >= 2 && (desc->flags & AV_PIX_FMT_FLAG_PLANAR));
695	695	}
696	696
697	697	static av_always_inline int isPackedRGB(enum AVPixelFormat pix_fmt)
698	698	{
699	699	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
700	700	av_assert0(desc);
701		− return ((desc->flags & (PIX_FMT_PLANAR \| PIX_FMT_RGB)) == PIX_FMT_RGB);
	701	+ return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB)) == AV_PIX_FMT_FLAG_RGB);
702	702	}
703	703
704	704	static av_always_inline int isPlanarRGB(enum AVPixelFormat pix_fmt)
705	705	{
706	706	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
707	707	av_assert0(desc);
708		− return ((desc->flags & (PIX_FMT_PLANAR \| PIX_FMT_RGB)) ==
709		− (PIX_FMT_PLANAR \| PIX_FMT_RGB));
	708	+ return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB)) ==
	709	+ (AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB));
710	710	}
711	711
712	712	static av_always_inline int usePal(enum AVPixelFormat pix_fmt)
713	713	{
714	714	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
715	715	av_assert0(desc);
716		− return ((desc->flags & PIX_FMT_PAL) \|\| (desc->flags & PIX_FMT_PSEUDOPAL) \|\|
	716	+ return ((desc->flags & AV_PIX_FMT_FLAG_PAL) \|\| (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) \|\|
717	717	pix_fmt == AV_PIX_FMT_Y400A);
718	718	}
719	719

libswscale/swscale_unscaled.c+1−1

@@ -563,7 +563,7 @@ static rgbConvFn findRgbConvFn(SwsContext *c) · 562 unmodified lines
563	563
564	564	#define IS_NOT_NE(bpp, desc) \
565	565	(((bpp + 7) >> 3) == 2 && \
566		− (!(desc->flags & PIX_FMT_BE) != !HAVE_BIGENDIAN))
	566	+ (!(desc->flags & AV_PIX_FMT_FLAG_BE) != !HAVE_BIGENDIAN))
567	567
568	568	/* if this is non-native rgb444/555/565, don't handle it here. */
569	569	if (IS_NOT_NE(srcId, desc_src) \|\| IS_NOT_NE(dstId, desc_dst))

pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code