Merge remote-tracking branch 'qatar/master'

* qatar/master: pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_* Conflicts: doc/APIchanges libavcodec/avpicture.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/tiffenc.c libavfilter/vf_pixdesctest.c libavfilter/vf_scale.c libavutil/imgutils.c libavutil/pixdesc.c libavutil/version.h libswscale/swscale_internal.h

Michael Niedermayer committed 13 years ago

Commit ff468092 parents 75835ab e6c4ac719 files · +204 −168Browse files

Unified · Split

19 files

cmdutils.c +5 −5
doc/APIchanges +3 −0
libavcodec/imgconvert.c +3 −3
libavcodec/pnm.c +1 −1
libavcodec/rawdec.c +3 −3
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 +4 −4
libavutil/frame.c +1 −1
libavutil/imgutils.c +9 −9
libavutil/pixdesc.c +111 −111
libavutil/pixdesc.h +42 −9
libavutil/version.h +1 −1
libswscale/swscale_internal.h +11 −11
libswscale/swscale_unscaled.c +1 −1

cmdutils.c+5−5

@@ -1504,11 +1504,11 @@ int show_pix_fmts(void optctx, const char opt, const char *arg) · 1503 unmodified lines
1504	1504	while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) {
1505	1505	enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(pix_desc);
1506	1506	printf("%c%c%c%c%c %-16s %d %2d\n",
1507		− sws_isSupportedInput (pix_fmt) ? 'I' : '.',
1508		− sws_isSupportedOutput(pix_fmt) ? 'O' : '.',
1509		− pix_desc->flags & PIX_FMT_HWACCEL ? 'H' : '.',
1510		− pix_desc->flags & PIX_FMT_PAL ? 'P' : '.',
1511		− pix_desc->flags & PIX_FMT_BITSTREAM ? 'B' : '.',
	1507	+ sws_isSupportedInput (pix_fmt) ? 'I' : '.',
	1508	+ sws_isSupportedOutput(pix_fmt) ? 'O' : '.',
	1509	+ pix_desc->flags & AV_PIX_FMT_FLAG_HWACCEL ? 'H' : '.',
	1510	+ pix_desc->flags & AV_PIX_FMT_FLAG_PAL ? 'P' : '.',
	1511	+ pix_desc->flags & AV_PIX_FMT_FLAG_BITSTREAM ? 'B' : '.',
1512	1512	pix_desc->name,
1513	1513	pix_desc->nb_components,
1514	1514	av_get_bits_per_pixel(pix_desc));

doc/APIchanges+3−0

@@ -173,6 +173,9 @@ API changes, most recent first: · 172 unmodified lines
173	173	2012-03-26 - a67d9cf - lavfi 2.66.100
174	174	Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
175	175
	176	+2013-05-xx - xxxxxxx - lavu 52.11.0 - pixdesc.h
	177	+ Replace PIX_FMT_* flags with AV_PIX_FMT_FLAG_*.
	178	+
176	179	2013-04-xx - xxxxxxx - lavc 55.4.0 - avcodec.h
177	180	Add field_order to AVCodecParserContext.
178	181

libavcodec/imgconvert.c+3−3

@@ -77,7 +77,7 @@ static int get_color_type(const AVPixFmtDescriptor *desc) { · 76 unmodified lines
77	77	if(desc->name && !strncmp(desc->name, "yuvj", 4))
78	78	return FF_COLOR_YUV_JPEG;
79	79
80		− if(desc->flags & PIX_FMT_RGB)
	80	+ if(desc->flags & AV_PIX_FMT_FLAG_RGB)
81	81	return FF_COLOR_RGB;
82	82
83	83	if(desc->nb_components == 0)
@@ -366,8 +366,8 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) · 282 unmodified lines
366	366	int i;
367	367	int planes[4] = { 0 };
368	368
369		− if ( desc->flags & PIX_FMT_RGB
370		− \|\| !(desc->flags & PIX_FMT_PLANAR))
	369	+ if ( desc->flags & AV_PIX_FMT_FLAG_RGB
	370	+ \|\| !(desc->flags & AV_PIX_FMT_FLAG_PLANAR))
371	371	return 0;
372	372
373	373	/* set the used planes */

libavcodec/pnm.c+1−1

@@ -181,7 +181,7 @@ int ff_pnm_decode_header(AVCodecContext avctx, PNMContext const s) · 180 unmodified lines
181	181	}else
182	182	s->maxval=1;
183	183	/* more check if YUV420 */
184		− if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & PIX_FMT_PLANAR) {
	184	+ if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) {
185	185	if ((avctx->width & 1) != 0)
186	186	return AVERROR_INVALIDDATA;
187	187	h = (avctx->height * 2);

libavcodec/rawdec.c+3−3

@@ -123,11 +123,11 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) · 122 unmodified lines
123	123	return AVERROR(EINVAL);
124	124	}
125	125
126		− if (desc->flags & (PIX_FMT_PAL \| PIX_FMT_PSEUDOPAL)) {
	126	+ if (desc->flags & (AV_PIX_FMT_FLAG_PAL \| AV_PIX_FMT_FLAG_PSEUDOPAL)) {
127	127	context->palette = av_buffer_alloc(AVPALETTE_SIZE);
128	128	if (!context->palette)
129	129	return AVERROR(ENOMEM);
130		− if (desc->flags & PIX_FMT_PSEUDOPAL)
	130	+ if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
131	131	avpriv_set_systematic_pal2((uint32_t*)context->palette->data, avctx->pix_fmt);
132	132	else
133	133	memset(context->palette->data, 0, AVPALETTE_SIZE);
@@ -276,7 +276,7 @@ static int raw_decode(AVCodecContext avctx, void data, int *got_frame, · 142 unmodified lines
276	276	}
277	277
278	278	if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) \|\|
279		− (desc->flags & PIX_FMT_PSEUDOPAL)) {
	279	+ (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) {
280	280	frame->buf[1] = av_buffer_ref(context->palette);
281	281	if (!frame->buf[1]) {
282	282	av_buffer_unref(&frame->buf[0]);

libavcodec/utils.c+2−2

@@ -762,7 +762,7 @@ do { \ · 761 unmodified lines
762	762	planes = av_pix_fmt_count_planes(frame->format);
763	763	/* workaround for AVHWAccel plane count of 0, buf[0] is used as
764	764	check for allocated buffers: make libavcodec happy */
765		− if (desc && desc->flags & PIX_FMT_HWACCEL)
	765	+ if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
766	766	planes = 1;
767	767	if (!desc \|\| planes <= 0) {
768	768	ret = AVERROR(EINVAL);
@@ -919,7 +919,7 @@ int avcodec_default_execute2(AVCodecContext c, int (func)(AVCodecContext *c2, · 150 unmodified lines
919	919	static int is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt)
920	920	{
921	921	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
922		− return desc->flags & PIX_FMT_HWACCEL;
	922	+ return desc->flags & AV_PIX_FMT_FLAG_HWACCEL;
923	923	}
924	924
925	925	enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext s, const enum AVPixelFormat fmt)

libavcodec/xwdenc.c+1−1

@@ -43,7 +43,7 @@ static int xwd_encode_frame(AVCodecContext avctx, AVPacket pkt, · 42 unmodified lines
43	43	AVFrame * const p = (AVFrame *)pict;
44	44
45	45	pixdepth = av_get_bits_per_pixel(desc);
46		− if (desc->flags & PIX_FMT_BE)
	46	+ if (desc->flags & AV_PIX_FMT_FLAG_BE)
47	47	be = 1;
48	48	switch (pix_fmt) {
49	49	case AV_PIX_FMT_ARGB:

libavfilter/formats.c+1−1

@@ -364,7 +364,7 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type) · 363 unmodified lines
364	364	for (fmt = 0; fmt < num_formats; fmt++) {
365	365	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
366	366	if ((type != AVMEDIA_TYPE_VIDEO) \|\|
367		− (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & PIX_FMT_HWACCEL)))
	367	+ (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)))
368	368	ff_add_format(&ret, fmt);
369	369	}
370	370

libavfilter/vf_crop.c+1−1

@@ -285,7 +285,7 @@ static int filter_frame(AVFilterLink link, AVFrame frame) · 284 unmodified lines
285	285	frame->data[0] += crop->y * frame->linesize[0];
286	286	frame->data[0] += crop->x * crop->max_step[0];
287	287
288		− if (!(desc->flags & PIX_FMT_PAL \|\| desc->flags & PIX_FMT_PSEUDOPAL)) {
	288	+ if (!(desc->flags & AV_PIX_FMT_FLAG_PAL \|\| desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) {
289	289	for (i = 1; i < 3; i ++) {
290	290	if (frame->data[i]) {
291	291	frame->data[i] += (crop->y >> crop->vsub) * frame->linesize[i];

libavfilter/vf_fieldorder.c+2−2

@@ -51,8 +51,8 @@ static int query_formats(AVFilterContext *ctx) · 50 unmodified lines
51	51	formats = NULL;
52	52	for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) {
53	53	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
54		− if (!(desc->flags & PIX_FMT_HWACCEL \|\|
55		− desc->flags & PIX_FMT_BITSTREAM) &&
	54	+ if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL \|\|
	55	+ desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) &&
56	56	desc->nb_components && !desc->log2_chroma_h &&
57	57	(ret = ff_add_format(&formats, pix_fmt)) < 0) {
58	58	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], AVPALETTE_SIZE);
84	84
85	85	for (c = 0; c < priv->pix_desc->nb_components; c++) {

libavfilter/vf_scale.c+4−4

@@ -252,11 +252,11 @@ static int config_props(AVFilterLink *outlink) · 251 unmodified lines
252	252
253	253	/* TODO: make algorithm configurable */
254	254
255		− scale->input_is_pal = desc->flags & PIX_FMT_PAL \|\|
256		− desc->flags & PIX_FMT_PSEUDOPAL;
	255	+ scale->input_is_pal = desc->flags & AV_PIX_FMT_FLAG_PAL \|\|
	256	+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL;
257	257	if (outfmt == AV_PIX_FMT_PAL8) outfmt = AV_PIX_FMT_BGR8;
258		− scale->output_is_pal = av_pix_fmt_desc_get(outfmt)->flags & PIX_FMT_PAL \|\|
259		− av_pix_fmt_desc_get(outfmt)->flags & PIX_FMT_PSEUDOPAL;
	258	+ scale->output_is_pal = av_pix_fmt_desc_get(outfmt)->flags & AV_PIX_FMT_FLAG_PAL \|\|
	259	+ av_pix_fmt_desc_get(outfmt)->flags & AV_PIX_FMT_FLAG_PSEUDOPAL;
260	260
261	261	if (scale->sws)
262	262	sws_freeContext(scale->sws);

libavutil/frame.c+1−1

@@ -146,7 +146,7 @@ static int get_video_buffer(AVFrame *frame, int align) · 145 unmodified lines
146	146
147	147	frame->data[i] = frame->buf[i]->data;
148	148	}
149		− if (desc->flags & PIX_FMT_PAL \|\| desc->flags & PIX_FMT_PSEUDOPAL) {
	149	+ if (desc->flags & AV_PIX_FMT_FLAG_PAL \|\| desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
150	150	av_buffer_unref(&frame->buf[1]);
151	151	frame->buf[1] = av_buffer_alloc(1024);
152	152	if (!frame->buf[1])

libavutil/imgutils.c+9−9

@@ -65,7 +65,7 @@ int image_get_linesize(int width, int plane, · 64 unmodified lines
65	65	return AVERROR(EINVAL);
66	66	linesize = max_step * shifted_w;
67	67
68		− if (desc->flags & PIX_FMT_BITSTREAM)
	68	+ if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM)
69	69	linesize = (linesize + 7) >> 3;
70	70	return linesize;
71	71	}
@@ -92,7 +92,7 @@ int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int wi · 20 unmodified lines
92	92
93	93	memset(linesizes, 0, 4*sizeof(linesizes[0]));
94	94
95		− if (!desc \|\| desc->flags & PIX_FMT_HWACCEL)
	95	+ if (!desc \|\| desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
96	96	return AVERROR(EINVAL);
97	97
98	98	av_image_fill_max_pixsteps(max_step, max_step_comp, desc);
@@ -113,7 +113,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei · 14 unmodified lines
113	113	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
114	114	memset(data , 0, sizeof(data[0])*4);
115	115
116		− if (!desc \|\| desc->flags & PIX_FMT_HWACCEL)
	116	+ if (!desc \|\| desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
117	117	return AVERROR(EINVAL);
118	118
119	119	data[0] = ptr;
@@ -121,8 +121,8 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei · 1 unmodified line
121	121	return AVERROR(EINVAL);
122	122	size[0] = linesizes[0] * height;
123	123
124		− if (desc->flags & PIX_FMT_PAL \|\|
125		− desc->flags & PIX_FMT_PSEUDOPAL) {
	124	+ if (desc->flags & AV_PIX_FMT_FLAG_PAL \|\|
	125	+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
126	126	size[0] = (size[0] + 3) & ~3;
127	127	data[1] = ptr + size[0]; /* palette is stored here as 256 32 bits words */
128	128	return size[0] + 256 * 4;
@@ -214,7 +214,7 @@ int av_image_alloc(uint8_t *pointers[4], int linesizes[4], · 85 unmodified lines
214	214	av_free(buf);
215	215	return ret;
216	216	}
217		− if (desc->flags & PIX_FMT_PAL \|\| desc->flags & PIX_FMT_PSEUDOPAL)
	217	+ if (desc->flags & AV_PIX_FMT_FLAG_PAL \|\| desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
218	218	avpriv_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt);
219	219
220	220	return ret;
@@ -260,11 +260,11 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], · 39 unmodified lines
260	260	{
261	261	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
262	262
263		− if (!desc \|\| desc->flags & PIX_FMT_HWACCEL)
	263	+ if (!desc \|\| desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
264	264	return;
265	265
266		− if (desc->flags & PIX_FMT_PAL \|\|
267		− desc->flags & PIX_FMT_PSEUDOPAL) {
	266	+ if (desc->flags & AV_PIX_FMT_FLAG_PAL \|\|
	267	+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
268	268	av_image_copy_plane(dst_data[0], dst_linesizes[0],
269	269	src_data[0], src_linesizes[0],
270	270	width, height);

libavutil/pixdesc.c+111−111

@@ -44,7 +44,7 @@ void av_read_image_line(uint16_t *dst, · 43 unmodified lines
44	44	int step = comp.step_minus1 + 1;
45	45	int flags = desc->flags;
46	46
47		− if (flags & PIX_FMT_BITSTREAM) {
	47	+ if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
48	48	int skip = x * step + comp.offset_plus1 - 1;
49	49	const uint8_t p = data[plane] + y linesize[plane] + (skip >> 3);
50	50	int shift = 8 - depth - (skip & 7);
@@ -64,11 +64,11 @@ void av_read_image_line(uint16_t *dst, · 13 unmodified lines
64	64	int is_8bit = shift + depth <= 8;
65	65
66	66	if (is_8bit)
67		− p += !!(flags & PIX_FMT_BE);
	67	+ p += !!(flags & AV_PIX_FMT_FLAG_BE);
68	68
69	69	while (w--) {
70	70	int val = is_8bit ? *p :
71		− flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p);
	71	+ flags & AV_PIX_FMT_FLAG_BE ? AV_RB16(p) : AV_RL16(p);
72	72	val = (val >> shift) & mask;
73	73	if (read_pal_component)
74	74	val = data[1][4 * val + c];
@@ -89,7 +89,7 @@ void av_write_image_line(const uint16_t *src, · 14 unmodified lines
89	89	int step = comp.step_minus1 + 1;
90	90	int flags = desc->flags;
91	91
92		− if (flags & PIX_FMT_BITSTREAM) {
	92	+ if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
93	93	int skip = x * step + comp.offset_plus1 - 1;
94	94	uint8_t p = data[plane] + y linesize[plane] + (skip >> 3);
95	95	int shift = 8 - depth - (skip & 7);
@@ -106,14 +106,14 @@ void av_write_image_line(const uint16_t *src, · 10 unmodified lines
106	106	x * step + comp.offset_plus1 - 1;
107	107
108	108	if (shift + depth <= 8) {
109		− p += !!(flags & PIX_FMT_BE);
	109	+ p += !!(flags & AV_PIX_FMT_FLAG_BE);
110	110	while (w--) {
111	111	p \|= (src++ << shift);
112	112	p += step;
113	113	}
114	114	} else {
115	115	while (w--) {
116		− if (flags & PIX_FMT_BE) {
	116	+ if (flags & AV_PIX_FMT_FLAG_BE) {
117	117	uint16_t val = AV_RB16(p) \| (*src++ << shift);
118	118	AV_WB16(p, val);
119	119	} else {
@@ -140,7 +140,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 20 unmodified lines
140	140	{ 1, 0, 1, 0, 7 }, /* U */
141	141	{ 2, 0, 1, 0, 7 }, /* V */
142	142	},
143		− .flags = PIX_FMT_PLANAR,
	143	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
144	144	},
145	145	[AV_PIX_FMT_YUYV422] = {
146	146	.name = "yuyv422",
@@ -163,7 +163,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 16 unmodified lines
163	163	{ 0, 2, 2, 0, 7 }, /* G */
164	164	{ 0, 2, 3, 0, 7 }, /* B */
165	165	},
166		− .flags = PIX_FMT_RGB,
	166	+ .flags = AV_PIX_FMT_FLAG_RGB,
167	167	},
168	168	[AV_PIX_FMT_BGR24] = {
169	169	.name = "bgr24",
@@ -175,7 +175,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
175	175	{ 0, 2, 2, 0, 7 }, /* G */
176	176	{ 0, 2, 1, 0, 7 }, /* B */
177	177	},
178		− .flags = PIX_FMT_RGB,
	178	+ .flags = AV_PIX_FMT_FLAG_RGB,
179	179	},
180	180	[AV_PIX_FMT_YUV422P] = {
181	181	.name = "yuv422p",
@@ -187,7 +187,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
187	187	{ 1, 0, 1, 0, 7 }, /* U */
188	188	{ 2, 0, 1, 0, 7 }, /* V */
189	189	},
190		− .flags = PIX_FMT_PLANAR,
	190	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
191	191	},
192	192	[AV_PIX_FMT_YUV444P] = {
193	193	.name = "yuv444p",
@@ -199,7 +199,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
199	199	{ 1, 0, 1, 0, 7 }, /* U */
200	200	{ 2, 0, 1, 0, 7 }, /* V */
201	201	},
202		− .flags = PIX_FMT_PLANAR,
	202	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
203	203	},
204	204	[AV_PIX_FMT_YUV410P] = {
205	205	.name = "yuv410p",
@@ -211,7 +211,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
211	211	{ 1, 0, 1, 0, 7 }, /* U */
212	212	{ 2, 0, 1, 0, 7 }, /* V */
213	213	},
214		− .flags = PIX_FMT_PLANAR,
	214	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
215	215	},
216	216	[AV_PIX_FMT_YUV411P] = {
217	217	.name = "yuv411p",
@@ -223,7 +223,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
223	223	{ 1, 0, 1, 0, 7 }, /* U */
224	224	{ 2, 0, 1, 0, 7 }, /* V */
225	225	},
226		− .flags = PIX_FMT_PLANAR,
	226	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
227	227	},
228	228	[AV_PIX_FMT_GRAY8] = {
229	229	.name = "gray",
@@ -243,7 +243,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 13 unmodified lines
243	243	.comp = {
244	244	{ 0, 0, 1, 0, 0 }, /* Y */
245	245	},
246		− .flags = PIX_FMT_BITSTREAM,
	246	+ .flags = AV_PIX_FMT_FLAG_BITSTREAM,
247	247	},
248	248	[AV_PIX_FMT_MONOBLACK] = {
249	249	.name = "monob",
@@ -253,7 +253,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
253	253	.comp = {
254	254	{ 0, 0, 1, 7, 0 }, /* Y */
255	255	},
256		− .flags = PIX_FMT_BITSTREAM,
	256	+ .flags = AV_PIX_FMT_FLAG_BITSTREAM,
257	257	},
258	258	[AV_PIX_FMT_PAL8] = {
259	259	.name = "pal8",
@@ -263,7 +263,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
263	263	.comp = {
264	264	{ 0, 0, 1, 0, 7 },
265	265	},
266		− .flags = PIX_FMT_PAL,
	266	+ .flags = AV_PIX_FMT_FLAG_PAL,
267	267	},
268	268	[AV_PIX_FMT_YUVJ420P] = {
269	269	.name = "yuvj420p",
@@ -275,7 +275,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
275	275	{ 1, 0, 1, 0, 7 }, /* U */
276	276	{ 2, 0, 1, 0, 7 }, /* V */
277	277	},
278		− .flags = PIX_FMT_PLANAR,
	278	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
279	279	},
280	280	[AV_PIX_FMT_YUVJ422P] = {
281	281	.name = "yuvj422p",
@@ -287,7 +287,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
287	287	{ 1, 0, 1, 0, 7 }, /* U */
288	288	{ 2, 0, 1, 0, 7 }, /* V */
289	289	},
290		− .flags = PIX_FMT_PLANAR,
	290	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
291	291	},
292	292	[AV_PIX_FMT_YUVJ444P] = {
293	293	.name = "yuvj444p",
@@ -299,15 +299,15 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
299	299	{ 1, 0, 1, 0, 7 }, /* U */
300	300	{ 2, 0, 1, 0, 7 }, /* V */
301	301	},
302		− .flags = PIX_FMT_PLANAR,
	302	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
303	303	},
304	304	[AV_PIX_FMT_XVMC_MPEG2_MC] = {
305	305	.name = "xvmcmc",
306		− .flags = PIX_FMT_HWACCEL,
	306	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
307	307	},
308	308	[AV_PIX_FMT_XVMC_MPEG2_IDCT] = {
309	309	.name = "xvmcidct",
310		− .flags = PIX_FMT_HWACCEL,
	310	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
311	311	},
312	312	[AV_PIX_FMT_UYVY422] = {
313	313	.name = "uyvy422",
@@ -341,7 +341,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 27 unmodified lines
341	341	{ 0, 0, 1, 3, 2 }, /* G */
342	342	{ 0, 0, 1, 6, 1 }, /* B */
343	343	},
344		− .flags = PIX_FMT_RGB \| PIX_FMT_PSEUDOPAL,
	344	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
345	345	},
346	346	[AV_PIX_FMT_BGR4] = {
347	347	.name = "bgr4",
@@ -353,7 +353,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
353	353	{ 0, 3, 2, 0, 1 }, /* G */
354	354	{ 0, 3, 1, 0, 0 }, /* B */
355	355	},
356		− .flags = PIX_FMT_BITSTREAM \| PIX_FMT_RGB,
	356	+ .flags = AV_PIX_FMT_FLAG_BITSTREAM \| AV_PIX_FMT_FLAG_RGB,
357	357	},
358	358	[AV_PIX_FMT_BGR4_BYTE] = {
359	359	.name = "bgr4_byte",
@@ -365,7 +365,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
365	365	{ 0, 0, 1, 1, 1 }, /* G */
366	366	{ 0, 0, 1, 3, 0 }, /* B */
367	367	},
368		− .flags = PIX_FMT_RGB \| PIX_FMT_PSEUDOPAL,
	368	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
369	369	},
370	370	[AV_PIX_FMT_RGB8] = {
371	371	.name = "rgb8",
@@ -377,7 +377,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
377	377	{ 0, 0, 1, 3, 2 }, /* G */
378	378	{ 0, 0, 1, 0, 2 }, /* B */
379	379	},
380		− .flags = PIX_FMT_RGB \| PIX_FMT_PSEUDOPAL,
	380	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
381	381	},
382	382	[AV_PIX_FMT_RGB4] = {
383	383	.name = "rgb4",
@@ -389,7 +389,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
389	389	{ 0, 3, 2, 0, 1 }, /* G */
390	390	{ 0, 3, 4, 0, 0 }, /* B */
391	391	},
392		− .flags = PIX_FMT_BITSTREAM \| PIX_FMT_RGB,
	392	+ .flags = AV_PIX_FMT_FLAG_BITSTREAM \| AV_PIX_FMT_FLAG_RGB,
393	393	},
394	394	[AV_PIX_FMT_RGB4_BYTE] = {
395	395	.name = "rgb4_byte",
@@ -401,7 +401,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
401	401	{ 0, 0, 1, 1, 1 }, /* G */
402	402	{ 0, 0, 1, 0, 0 }, /* B */
403	403	},
404		− .flags = PIX_FMT_RGB \| PIX_FMT_PSEUDOPAL,
	404	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
405	405	},
406	406	[AV_PIX_FMT_NV12] = {
407	407	.name = "nv12",
@@ -413,7 +413,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
413	413	{ 1, 1, 1, 0, 7 }, /* U */
414	414	{ 1, 1, 2, 0, 7 }, /* V */
415	415	},
416		− .flags = PIX_FMT_PLANAR,
	416	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
417	417	},
418	418	[AV_PIX_FMT_NV21] = {
419	419	.name = "nv21",
@@ -425,7 +425,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
425	425	{ 1, 1, 2, 0, 7 }, /* U */
426	426	{ 1, 1, 1, 0, 7 }, /* V */
427	427	},
428		− .flags = PIX_FMT_PLANAR,
	428	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
429	429	},
430	430	[AV_PIX_FMT_ARGB] = {
431	431	.name = "argb",
@@ -438,7 +438,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
438	438	{ 0, 3, 4, 0, 7 }, /* B */
439	439	{ 0, 3, 1, 0, 7 }, /* A */
440	440	},
441		− .flags = PIX_FMT_RGB \| PIX_FMT_ALPHA,
	441	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
442	442	},
443	443	[AV_PIX_FMT_RGBA] = {
444	444	.name = "rgba",
@@ -451,7 +451,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
451	451	{ 0, 3, 3, 0, 7 }, /* B */
452	452	{ 0, 3, 4, 0, 7 }, /* A */
453	453	},
454		− .flags = PIX_FMT_RGB \| PIX_FMT_ALPHA,
	454	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
455	455	},
456	456	[AV_PIX_FMT_ABGR] = {
457	457	.name = "abgr",
@@ -464,7 +464,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
464	464	{ 0, 3, 2, 0, 7 }, /* B */
465	465	{ 0, 3, 1, 0, 7 }, /* A */
466	466	},
467		− .flags = PIX_FMT_RGB \| PIX_FMT_ALPHA,
	467	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
468	468	},
469	469	[AV_PIX_FMT_BGRA] = {
470	470	.name = "bgra",
@@ -477,7 +477,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
477	477	{ 0, 3, 1, 0, 7 }, /* B */
478	478	{ 0, 3, 4, 0, 7 }, /* A */
479	479	},
480		− .flags = PIX_FMT_RGB \| PIX_FMT_ALPHA,
	480	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
481	481	},
482	482	[AV_PIX_FMT_0RGB] = {
483	483	.name = "0rgb",
@@ -535,7 +535,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 51 unmodified lines
535	535	.comp = {
536	536	{ 0, 1, 1, 0, 15 }, /* Y */
537	537	},
538		− .flags = PIX_FMT_BE,
	538	+ .flags = AV_PIX_FMT_FLAG_BE,
539	539	},
540	540	[AV_PIX_FMT_GRAY16LE] = {
541	541	.name = "gray16le",
@@ -556,7 +556,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 14 unmodified lines
556	556	{ 1, 0, 1, 0, 7 }, /* U */
557	557	{ 2, 0, 1, 0, 7 }, /* V */
558	558	},
559		− .flags = PIX_FMT_PLANAR,
	559	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
560	560	},
561	561	[AV_PIX_FMT_YUVJ440P] = {
562	562	.name = "yuvj440p",
@@ -568,7 +568,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
568	568	{ 1, 0, 1, 0, 7 }, /* U */
569	569	{ 2, 0, 1, 0, 7 }, /* V */
570	570	},
571		− .flags = PIX_FMT_PLANAR,
	571	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
572	572	},
573	573	[AV_PIX_FMT_YUVA420P] = {
574	574	.name = "yuva420p",
@@ -581,7 +581,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
581	581	{ 2, 0, 1, 0, 7 }, /* V */
582	582	{ 3, 0, 1, 0, 7 }, /* A */
583	583	},
584		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	584	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
585	585	},
586	586	[AV_PIX_FMT_YUVA422P] = {
587	587	.name = "yuva422p",
@@ -594,7 +594,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
594	594	{ 2, 0, 1, 0, 7 }, /* V */
595	595	{ 3, 0, 1, 0, 7 }, /* A */
596	596	},
597		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	597	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
598	598	},
599	599	[AV_PIX_FMT_YUVA444P] = {
600	600	.name = "yuva444p",
@@ -607,7 +607,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
607	607	{ 2, 0, 1, 0, 7 }, /* V */
608	608	{ 3, 0, 1, 0, 7 }, /* A */
609	609	},
610		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	610	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
611	611	},
612	612	[AV_PIX_FMT_YUVA420P9BE] = {
613	613	.name = "yuva420p9be",
@@ -620,7 +620,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
620	620	{ 2, 1, 1, 0, 8 }, /* V */
621	621	{ 3, 1, 1, 0, 8 }, /* A */
622	622	},
623		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	623	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
624	624	},
625	625	[AV_PIX_FMT_YUVA420P9LE] = {
626	626	.name = "yuva420p9le",
@@ -633,7 +633,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
633	633	{ 2, 1, 1, 0, 8 }, /* V */
634	634	{ 3, 1, 1, 0, 8 }, /* A */
635	635	},
636		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	636	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
637	637	},
638	638	[AV_PIX_FMT_YUVA422P9BE] = {
639	639	.name = "yuva422p9be",
@@ -646,7 +646,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
646	646	{ 2, 1, 1, 0, 8 }, /* V */
647	647	{ 3, 1, 1, 0, 8 }, /* A */
648	648	},
649		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	649	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
650	650	},
651	651	[AV_PIX_FMT_YUVA422P9LE] = {
652	652	.name = "yuva422p9le",
@@ -659,7 +659,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
659	659	{ 2, 1, 1, 0, 8 }, /* V */
660	660	{ 3, 1, 1, 0, 8 }, /* A */
661	661	},
662		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	662	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
663	663	},
664	664	[AV_PIX_FMT_YUVA444P9BE] = {
665	665	.name = "yuva444p9be",
@@ -672,7 +672,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
672	672	{ 2, 1, 1, 0, 8 }, /* V */
673	673	{ 3, 1, 1, 0, 8 }, /* A */
674	674	},
675		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	675	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
676	676	},
677	677	[AV_PIX_FMT_YUVA444P9LE] = {
678	678	.name = "yuva444p9le",
@@ -685,7 +685,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
685	685	{ 2, 1, 1, 0, 8 }, /* V */
686	686	{ 3, 1, 1, 0, 8 }, /* A */
687	687	},
688		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	688	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
689	689	},
690	690	[AV_PIX_FMT_YUVA420P10BE] = {
691	691	.name = "yuva420p10be",
@@ -698,7 +698,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
698	698	{ 2, 1, 1, 0, 9 }, /* V */
699	699	{ 3, 1, 1, 0, 9 }, /* A */
700	700	},
701		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	701	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
702	702	},
703	703	[AV_PIX_FMT_YUVA420P10LE] = {
704	704	.name = "yuva420p10le",
@@ -711,7 +711,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
711	711	{ 2, 1, 1, 0, 9 }, /* V */
712	712	{ 3, 1, 1, 0, 9 }, /* A */
713	713	},
714		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	714	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
715	715	},
716	716	[AV_PIX_FMT_YUVA422P10BE] = {
717	717	.name = "yuva422p10be",
@@ -724,7 +724,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
724	724	{ 2, 1, 1, 0, 9 }, /* V */
725	725	{ 3, 1, 1, 0, 9 }, /* A */
726	726	},
727		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	727	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
728	728	},
729	729	[AV_PIX_FMT_YUVA422P10LE] = {
730	730	.name = "yuva422p10le",
@@ -737,7 +737,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
737	737	{ 2, 1, 1, 0, 9 }, /* V */
738	738	{ 3, 1, 1, 0, 9 }, /* A */
739	739	},
740		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	740	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
741	741	},
742	742	[AV_PIX_FMT_YUVA444P10BE] = {
743	743	.name = "yuva444p10be",
@@ -750,7 +750,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
750	750	{ 2, 1, 1, 0, 9 }, /* V */
751	751	{ 3, 1, 1, 0, 9 }, /* A */
752	752	},
753		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	753	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
754	754	},
755	755	[AV_PIX_FMT_YUVA444P10LE] = {
756	756	.name = "yuva444p10le",
@@ -763,7 +763,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
763	763	{ 2, 1, 1, 0, 9 }, /* V */
764	764	{ 3, 1, 1, 0, 9 }, /* A */
765	765	},
766		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	766	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
767	767	},
768	768	[AV_PIX_FMT_YUVA420P16BE] = {
769	769	.name = "yuva420p16be",
@@ -776,7 +776,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
776	776	{ 2, 1, 1, 0, 15 }, /* V */
777	777	{ 3, 1, 1, 0, 15 }, /* A */
778	778	},
779		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	779	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
780	780	},
781	781	[AV_PIX_FMT_YUVA420P16LE] = {
782	782	.name = "yuva420p16le",
@@ -789,7 +789,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
789	789	{ 2, 1, 1, 0, 15 }, /* V */
790	790	{ 3, 1, 1, 0, 15 }, /* A */
791	791	},
792		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	792	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
793	793	},
794	794	[AV_PIX_FMT_YUVA422P16BE] = {
795	795	.name = "yuva422p16be",
@@ -802,7 +802,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
802	802	{ 2, 1, 1, 0, 15 }, /* V */
803	803	{ 3, 1, 1, 0, 15 }, /* A */
804	804	},
805		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	805	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
806	806	},
807	807	[AV_PIX_FMT_YUVA422P16LE] = {
808	808	.name = "yuva422p16le",
@@ -815,7 +815,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
815	815	{ 2, 1, 1, 0, 15 }, /* V */
816	816	{ 3, 1, 1, 0, 15 }, /* A */
817	817	},
818		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	818	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
819	819	},
820	820	[AV_PIX_FMT_YUVA444P16BE] = {
821	821	.name = "yuva444p16be",
@@ -828,7 +828,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
828	828	{ 2, 1, 1, 0, 15 }, /* V */
829	829	{ 3, 1, 1, 0, 15 }, /* A */
830	830	},
831		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	831	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
832	832	},
833	833	[AV_PIX_FMT_YUVA444P16LE] = {
834	834	.name = "yuva444p16le",
@@ -841,43 +841,43 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 6 unmodified lines
841	841	{ 2, 1, 1, 0, 15 }, /* V */
842	842	{ 3, 1, 1, 0, 15 }, /* A */
843	843	},
844		− .flags = PIX_FMT_PLANAR \| PIX_FMT_ALPHA,
	844	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
845	845	},
846	846	[AV_PIX_FMT_VDPAU_H264] = {
847	847	.name = "vdpau_h264",
848	848	.log2_chroma_w = 1,
849	849	.log2_chroma_h = 1,
850		− .flags = PIX_FMT_HWACCEL,
	850	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
851	851	},
852	852	[AV_PIX_FMT_VDPAU_MPEG1] = {
853	853	.name = "vdpau_mpeg1",
854	854	.log2_chroma_w = 1,
855	855	.log2_chroma_h = 1,
856		− .flags = PIX_FMT_HWACCEL,
	856	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
857	857	},
858	858	[AV_PIX_FMT_VDPAU_MPEG2] = {
859	859	.name = "vdpau_mpeg2",
860	860	.log2_chroma_w = 1,
861	861	.log2_chroma_h = 1,
862		− .flags = PIX_FMT_HWACCEL,
	862	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
863	863	},
864	864	[AV_PIX_FMT_VDPAU_WMV3] = {
865	865	.name = "vdpau_wmv3",
866	866	.log2_chroma_w = 1,
867	867	.log2_chroma_h = 1,
868		− .flags = PIX_FMT_HWACCEL,
	868	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
869	869	},
870	870	[AV_PIX_FMT_VDPAU_VC1] = {
871	871	.name = "vdpau_vc1",
872	872	.log2_chroma_w = 1,
873	873	.log2_chroma_h = 1,
874		− .flags = PIX_FMT_HWACCEL,
	874	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
875	875	},
876	876	[AV_PIX_FMT_VDPAU_MPEG4] = {
877	877	.name = "vdpau_mpeg4",
878	878	.log2_chroma_w = 1,
879	879	.log2_chroma_h = 1,
880		− .flags = PIX_FMT_HWACCEL,
	880	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
881	881	},
882	882	[AV_PIX_FMT_RGB48BE] = {
883	883	.name = "rgb48be",
@@ -889,7 +889,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
889	889	{ 0, 5, 3, 0, 15 }, /* G */
890	890	{ 0, 5, 5, 0, 15 }, /* B */
891	891	},
892		− .flags = PIX_FMT_RGB \| PIX_FMT_BE,
	892	+ .flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_BE,
893	893	},
894	894	[AV_PIX_FMT_RGB48LE] = {
895	895	.name = "rgb48le",
@@ -901,7 +901,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
901	901	{ 0, 5, 3, 0, 15 }, /* G */
902	902	{ 0, 5, 5, 0, 15 }, /* B */
903	903	},
904		− .flags = PIX_FMT_RGB,
	904	+ .flags = AV_PIX_FMT_FLAG_RGB,
905	905	},
906	906	[AV_PIX_FMT_RGBA64BE] = {
907	907	.name = "rgba64be",
@@ -939,7 +939,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 31 unmodified lines
939	939	{ 0, 1, 1, 5, 5 }, /* G */
940	940	{ 0, 1, 1, 0, 4 }, /* B */
941	941	},
942		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	942	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
943	943	},
944	944	[AV_PIX_FMT_RGB565LE] = {
945	945	.name = "rgb565le",
@@ -951,7 +951,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
951	951	{ 0, 1, 1, 5, 5 }, /* G */
952	952	{ 0, 1, 1, 0, 4 }, /* B */
953	953	},
954		− .flags = PIX_FMT_RGB,
	954	+ .flags = AV_PIX_FMT_FLAG_RGB,
955	955	},
956	956	[AV_PIX_FMT_RGB555BE] = {
957	957	.name = "rgb555be",
@@ -963,7 +963,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
963	963	{ 0, 1, 1, 5, 4 }, /* G */
964	964	{ 0, 1, 1, 0, 4 }, /* B */
965	965	},
966		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	966	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
967	967	},
968	968	[AV_PIX_FMT_RGB555LE] = {
969	969	.name = "rgb555le",
@@ -975,7 +975,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
975	975	{ 0, 1, 1, 5, 4 }, /* G */
976	976	{ 0, 1, 1, 0, 4 }, /* B */
977	977	},
978		− .flags = PIX_FMT_RGB,
	978	+ .flags = AV_PIX_FMT_FLAG_RGB,
979	979	},
980	980	[AV_PIX_FMT_RGB444BE] = {
981	981	.name = "rgb444be",
@@ -987,7 +987,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
987	987	{ 0, 1, 1, 4, 3 }, /* G */
988	988	{ 0, 1, 1, 0, 3 }, /* B */
989	989	},
990		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	990	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
991	991	},
992	992	[AV_PIX_FMT_RGB444LE] = {
993	993	.name = "rgb444le",
@@ -999,7 +999,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
999	999	{ 0, 1, 1, 4, 3 }, /* G */
1000	1000	{ 0, 1, 1, 0, 3 }, /* B */
1001	1001	},
1002		− .flags = PIX_FMT_RGB,
	1002	+ .flags = AV_PIX_FMT_FLAG_RGB,
1003	1003	},
1004	1004	[AV_PIX_FMT_BGR48BE] = {
1005	1005	.name = "bgr48be",
@@ -1011,7 +1011,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1011	1011	{ 0, 5, 3, 0, 15 }, /* G */
1012	1012	{ 0, 5, 1, 0, 15 }, /* B */
1013	1013	},
1014		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	1014	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1015	1015	},
1016	1016	[AV_PIX_FMT_BGR48LE] = {
1017	1017	.name = "bgr48le",
@@ -1023,7 +1023,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1023	1023	{ 0, 5, 3, 0, 15 }, /* G */
1024	1024	{ 0, 5, 1, 0, 15 }, /* B */
1025	1025	},
1026		− .flags = PIX_FMT_RGB,
	1026	+ .flags = AV_PIX_FMT_FLAG_RGB,
1027	1027	},
1028	1028	[AV_PIX_FMT_BGRA64BE] = {
1029	1029	.name = "bgra64be",
@@ -1061,7 +1061,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 31 unmodified lines
1061	1061	{ 0, 1, 1, 5, 5 }, /* G */
1062	1062	{ 0, 1, 0, 3, 4 }, /* B */
1063	1063	},
1064		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	1064	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1065	1065	},
1066	1066	[AV_PIX_FMT_BGR565LE] = {
1067	1067	.name = "bgr565le",
@@ -1073,7 +1073,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1073	1073	{ 0, 1, 1, 5, 5 }, /* G */
1074	1074	{ 0, 1, 2, 3, 4 }, /* B */
1075	1075	},
1076		− .flags = PIX_FMT_RGB,
	1076	+ .flags = AV_PIX_FMT_FLAG_RGB,
1077	1077	},
1078	1078	[AV_PIX_FMT_BGR555BE] = {
1079	1079	.name = "bgr555be",
@@ -1085,7 +1085,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1085	1085	{ 0, 1, 1, 5, 4 }, /* G */
1086	1086	{ 0, 1, 0, 2, 4 }, /* B */
1087	1087	},
1088		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	1088	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1089	1089	},
1090	1090	[AV_PIX_FMT_BGR555LE] = {
1091	1091	.name = "bgr555le",
@@ -1097,7 +1097,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1097	1097	{ 0, 1, 1, 5, 4 }, /* G */
1098	1098	{ 0, 1, 2, 2, 4 }, /* B */
1099	1099	},
1100		− .flags = PIX_FMT_RGB,
	1100	+ .flags = AV_PIX_FMT_FLAG_RGB,
1101	1101	},
1102	1102	[AV_PIX_FMT_BGR444BE] = {
1103	1103	.name = "bgr444be",
@@ -1109,7 +1109,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1109	1109	{ 0, 1, 1, 4, 3 }, /* G */
1110	1110	{ 0, 1, 0, 0, 3 }, /* B */
1111	1111	},
1112		− .flags = PIX_FMT_BE \| PIX_FMT_RGB,
	1112	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1113	1113	},
1114	1114	[AV_PIX_FMT_BGR444LE] = {
1115	1115	.name = "bgr444le",
@@ -1121,25 +1121,25 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1121	1121	{ 0, 1, 1, 4, 3 }, /* G */
1122	1122	{ 0, 1, 2, 0, 3 }, /* B */
1123	1123	},
1124		− .flags = PIX_FMT_RGB,
	1124	+ .flags = AV_PIX_FMT_FLAG_RGB,
1125	1125	},
1126	1126	[AV_PIX_FMT_VAAPI_MOCO] = {
1127	1127	.name = "vaapi_moco",
1128	1128	.log2_chroma_w = 1,
1129	1129	.log2_chroma_h = 1,
1130		− .flags = PIX_FMT_HWACCEL,
	1130	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1131	1131	},
1132	1132	[AV_PIX_FMT_VAAPI_IDCT] = {
1133	1133	.name = "vaapi_idct",
1134	1134	.log2_chroma_w = 1,
1135	1135	.log2_chroma_h = 1,
1136		− .flags = PIX_FMT_HWACCEL,
	1136	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1137	1137	},
1138	1138	[AV_PIX_FMT_VAAPI_VLD] = {
1139	1139	.name = "vaapi_vld",
1140	1140	.log2_chroma_w = 1,
1141	1141	.log2_chroma_h = 1,
1142		− .flags = PIX_FMT_HWACCEL,
	1142	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1143	1143	},
1144	1144	[AV_PIX_FMT_YUV420P9LE] = {
1145	1145	.name = "yuv420p9le",
@@ -1151,7 +1151,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1151	1151	{ 1, 1, 1, 0, 8 }, /* U */
1152	1152	{ 2, 1, 1, 0, 8 }, /* V */
1153	1153	},
1154		− .flags = PIX_FMT_PLANAR,
	1154	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1155	1155	},
1156	1156	[AV_PIX_FMT_YUV420P9BE] = {
1157	1157	.name = "yuv420p9be",
@@ -1163,7 +1163,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1163	1163	{ 1, 1, 1, 0, 8 }, /* U */
1164	1164	{ 2, 1, 1, 0, 8 }, /* V */
1165	1165	},
1166		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1166	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1167	1167	},
1168	1168	[AV_PIX_FMT_YUV420P10LE] = {
1169	1169	.name = "yuv420p10le",
@@ -1175,7 +1175,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1175	1175	{ 1, 1, 1, 0, 9 }, /* U */
1176	1176	{ 2, 1, 1, 0, 9 }, /* V */
1177	1177	},
1178		− .flags = PIX_FMT_PLANAR,
	1178	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1179	1179	},
1180	1180	[AV_PIX_FMT_YUV420P10BE] = {
1181	1181	.name = "yuv420p10be",
@@ -1187,7 +1187,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1187	1187	{ 1, 1, 1, 0, 9 }, /* U */
1188	1188	{ 2, 1, 1, 0, 9 }, /* V */
1189	1189	},
1190		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1190	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1191	1191	},
1192	1192	[AV_PIX_FMT_YUV420P12LE] = {
1193	1193	.name = "yuv420p12le",
@@ -1247,7 +1247,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 53 unmodified lines
1247	1247	{ 1, 1, 1, 0, 15 }, /* U */
1248	1248	{ 2, 1, 1, 0, 15 }, /* V */
1249	1249	},
1250		− .flags = PIX_FMT_PLANAR,
	1250	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1251	1251	},
1252	1252	[AV_PIX_FMT_YUV420P16BE] = {
1253	1253	.name = "yuv420p16be",
@@ -1259,7 +1259,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1259	1259	{ 1, 1, 1, 0, 15 }, /* U */
1260	1260	{ 2, 1, 1, 0, 15 }, /* V */
1261	1261	},
1262		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1262	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1263	1263	},
1264	1264	[AV_PIX_FMT_YUV422P9LE] = {
1265	1265	.name = "yuv422p9le",
@@ -1271,7 +1271,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1271	1271	{ 1, 1, 1, 0, 8 }, /* U */
1272	1272	{ 2, 1, 1, 0, 8 }, /* V */
1273	1273	},
1274		− .flags = PIX_FMT_PLANAR,
	1274	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1275	1275	},
1276	1276	[AV_PIX_FMT_YUV422P9BE] = {
1277	1277	.name = "yuv422p9be",
@@ -1283,7 +1283,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1283	1283	{ 1, 1, 1, 0, 8 }, /* U */
1284	1284	{ 2, 1, 1, 0, 8 }, /* V */
1285	1285	},
1286		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1286	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1287	1287	},
1288	1288	[AV_PIX_FMT_YUV422P10LE] = {
1289	1289	.name = "yuv422p10le",
@@ -1295,7 +1295,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1295	1295	{ 1, 1, 1, 0, 9 }, /* U */
1296	1296	{ 2, 1, 1, 0, 9 }, /* V */
1297	1297	},
1298		− .flags = PIX_FMT_PLANAR,
	1298	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1299	1299	},
1300	1300	[AV_PIX_FMT_YUV422P10BE] = {
1301	1301	.name = "yuv422p10be",
@@ -1307,7 +1307,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1307	1307	{ 1, 1, 1, 0, 9 }, /* U */
1308	1308	{ 2, 1, 1, 0, 9 }, /* V */
1309	1309	},
1310		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1310	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1311	1311	},
1312	1312	[AV_PIX_FMT_YUV422P12LE] = {
1313	1313	.name = "yuv422p12le",
@@ -1367,7 +1367,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 53 unmodified lines
1367	1367	{ 1, 1, 1, 0, 15 }, /* U */
1368	1368	{ 2, 1, 1, 0, 15 }, /* V */
1369	1369	},
1370		− .flags = PIX_FMT_PLANAR,
	1370	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1371	1371	},
1372	1372	[AV_PIX_FMT_YUV422P16BE] = {
1373	1373	.name = "yuv422p16be",
@@ -1379,7 +1379,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1379	1379	{ 1, 1, 1, 0, 15 }, /* U */
1380	1380	{ 2, 1, 1, 0, 15 }, /* V */
1381	1381	},
1382		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1382	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1383	1383	},
1384	1384	[AV_PIX_FMT_YUV444P16LE] = {
1385	1385	.name = "yuv444p16le",
@@ -1391,7 +1391,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1391	1391	{ 1, 1, 1, 0, 15 }, /* U */
1392	1392	{ 2, 1, 1, 0, 15 }, /* V */
1393	1393	},
1394		− .flags = PIX_FMT_PLANAR,
	1394	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1395	1395	},
1396	1396	[AV_PIX_FMT_YUV444P16BE] = {
1397	1397	.name = "yuv444p16be",
@@ -1403,7 +1403,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1403	1403	{ 1, 1, 1, 0, 15 }, /* U */
1404	1404	{ 2, 1, 1, 0, 15 }, /* V */
1405	1405	},
1406		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1406	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1407	1407	},
1408	1408	[AV_PIX_FMT_YUV444P10LE] = {
1409	1409	.name = "yuv444p10le",
@@ -1415,7 +1415,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1415	1415	{ 1, 1, 1, 0, 9 }, /* U */
1416	1416	{ 2, 1, 1, 0, 9 }, /* V */
1417	1417	},
1418		− .flags = PIX_FMT_PLANAR,
	1418	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1419	1419	},
1420	1420	[AV_PIX_FMT_YUV444P10BE] = {
1421	1421	.name = "yuv444p10be",
@@ -1427,7 +1427,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1427	1427	{ 1, 1, 1, 0, 9 }, /* U */
1428	1428	{ 2, 1, 1, 0, 9 }, /* V */
1429	1429	},
1430		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1430	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1431	1431	},
1432	1432	[AV_PIX_FMT_YUV444P9LE] = {
1433	1433	.name = "yuv444p9le",
@@ -1439,7 +1439,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1439	1439	{ 1, 1, 1, 0, 8 }, /* U */
1440	1440	{ 2, 1, 1, 0, 8 }, /* V */
1441	1441	},
1442		− .flags = PIX_FMT_PLANAR,
	1442	+ .flags = AV_PIX_FMT_FLAG_PLANAR,
1443	1443	},
1444	1444	[AV_PIX_FMT_YUV444P9BE] = {
1445	1445	.name = "yuv444p9be",
@@ -1451,7 +1451,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1451	1451	{ 1, 1, 1, 0, 8 }, /* U */
1452	1452	{ 2, 1, 1, 0, 8 }, /* V */
1453	1453	},
1454		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR,
	1454	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1455	1455	},
1456	1456	[AV_PIX_FMT_YUV444P12LE] = {
1457	1457	.name = "yuv444p12le",
@@ -1505,7 +1505,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 47 unmodified lines
1505	1505	.name = "dxva2_vld",
1506	1506	.log2_chroma_w = 1,
1507	1507	.log2_chroma_h = 1,
1508		− .flags = PIX_FMT_HWACCEL,
	1508	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1509	1509	},
1510	1510	[AV_PIX_FMT_VDA_VLD] = {
1511	1511	.name = "vda_vld",
@@ -1520,7 +1520,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 8 unmodified lines
1520	1520	{ 0, 1, 1, 0, 7 }, /* Y */
1521	1521	{ 0, 1, 2, 0, 7 }, /* A */
1522	1522	},
1523		− .flags = PIX_FMT_ALPHA,
	1523	+ .flags = AV_PIX_FMT_FLAG_ALPHA,
1524	1524	},
1525	1525	[AV_PIX_FMT_GBRP] = {
1526	1526	.name = "gbrp",
@@ -1532,7 +1532,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1532	1532	{ 0, 0, 1, 0, 7 }, /* G */
1533	1533	{ 1, 0, 1, 0, 7 }, /* B */
1534	1534	},
1535		− .flags = PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1535	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1536	1536	},
1537	1537	[AV_PIX_FMT_GBRP9LE] = {
1538	1538	.name = "gbrp9le",
@@ -1544,7 +1544,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1544	1544	{ 0, 1, 1, 0, 8 }, /* G */
1545	1545	{ 1, 1, 1, 0, 8 }, /* B */
1546	1546	},
1547		− .flags = PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1547	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1548	1548	},
1549	1549	[AV_PIX_FMT_GBRP9BE] = {
1550	1550	.name = "gbrp9be",
@@ -1556,7 +1556,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1556	1556	{ 0, 1, 1, 0, 8 }, /* G */
1557	1557	{ 1, 1, 1, 0, 8 }, /* B */
1558	1558	},
1559		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1559	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1560	1560	},
1561	1561	[AV_PIX_FMT_GBRP10LE] = {
1562	1562	.name = "gbrp10le",
@@ -1568,7 +1568,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1568	1568	{ 0, 1, 1, 0, 9 }, /* G */
1569	1569	{ 1, 1, 1, 0, 9 }, /* B */
1570	1570	},
1571		− .flags = PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1571	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1572	1572	},
1573	1573	[AV_PIX_FMT_GBRP10BE] = {
1574	1574	.name = "gbrp10be",
@@ -1628,7 +1628,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 53 unmodified lines
1628	1628	{ 0, 1, 1, 0, 13 }, /* G */
1629	1629	{ 1, 1, 1, 0, 13 }, /* B */
1630	1630	},
1631		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1631	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1632	1632	},
1633	1633	[AV_PIX_FMT_GBRP16LE] = {
1634	1634	.name = "gbrp16le",
@@ -1640,7 +1640,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1640	1640	{ 0, 1, 1, 0, 15 }, /* G */
1641	1641	{ 1, 1, 1, 0, 15 }, /* B */
1642	1642	},
1643		− .flags = PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1643	+ .flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1644	1644	},
1645	1645	[AV_PIX_FMT_GBRP16BE] = {
1646	1646	.name = "gbrp16be",
@@ -1652,7 +1652,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 5 unmodified lines
1652	1652	{ 0, 1, 1, 0, 15 }, /* G */
1653	1653	{ 1, 1, 1, 0, 15 }, /* B */
1654	1654	},
1655		− .flags = PIX_FMT_BE \| PIX_FMT_PLANAR \| PIX_FMT_RGB,
	1655	+ .flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1656	1656	},
1657	1657	[AV_PIX_FMT_GBRAP] = {
1658	1658	.name = "gbrap",
@@ -1697,7 +1697,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 38 unmodified lines
1697	1697	.name = "vdpau",
1698	1698	.log2_chroma_w = 1,
1699	1699	.log2_chroma_h = 1,
1700		− .flags = PIX_FMT_HWACCEL,
	1700	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
1701	1701	},
1702	1702	[AV_PIX_FMT_XYZ12LE] = {
1703	1703	.name = "xyz12le",
@@ -1721,7 +1721,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 17 unmodified lines
1721	1721	{ 0, 5, 3, 4, 11 }, /* Y */
1722	1722	{ 0, 5, 5, 4, 11 }, /* Z */
1723	1723	},
1724		− .flags = PIX_FMT_BE,
	1724	+ .flags = AV_PIX_FMT_FLAG_BE,
1725	1725	},
1726	1726	};
1727	1727

libavutil/pixdesc.h+42−9

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

libavutil/version.h+1−1

@@ -75,7 +75,7 @@ · 74 unmodified lines
75	75	*/
76	76
77	77	#define LIBAVUTIL_VERSION_MAJOR 52
78		−#define LIBAVUTIL_VERSION_MINOR 31
	78	+#define LIBAVUTIL_VERSION_MINOR 32
79	79	#define LIBAVUTIL_VERSION_MICRO 100
80	80
81	81	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

libswscale/swscale_internal.h+11−11

@@ -633,33 +633,33 @@ static av_always_inline int isBE(enum AVPixelFormat pix_fmt) · 632 unmodified lines
633	633	{
634	634	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
635	635	av_assert0(desc);
636		− return desc->flags & PIX_FMT_BE;
	636	+ return desc->flags & AV_PIX_FMT_FLAG_BE;
637	637	}
638	638
639	639	static av_always_inline int isYUV(enum AVPixelFormat pix_fmt)
640	640	{
641	641	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
642	642	av_assert0(desc);
643		− return !(desc->flags & PIX_FMT_RGB) && desc->nb_components >= 2;
	643	+ return !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2;
644	644	}
645	645
646	646	static av_always_inline int isPlanarYUV(enum AVPixelFormat pix_fmt)
647	647	{
648	648	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
649	649	av_assert0(desc);
650		− return ((desc->flags & PIX_FMT_PLANAR) && isYUV(pix_fmt));
	650	+ return ((desc->flags & AV_PIX_FMT_FLAG_PLANAR) && isYUV(pix_fmt));
651	651	}
652	652
653	653	static av_always_inline int isRGB(enum AVPixelFormat pix_fmt)
654	654	{
655	655	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
656	656	av_assert0(desc);
657		− return (desc->flags & PIX_FMT_RGB);
	657	+ return (desc->flags & AV_PIX_FMT_FLAG_RGB);
658	658	}
659	659
660	660	#if 0 // FIXME
661	661	#define isGray(x) \
662		− (!(av_pix_fmt_desc_get(x)->flags & PIX_FMT_PAL) && \
	662	+ (!(av_pix_fmt_desc_get(x)->flags & AV_PIX_FMT_FLAG_PAL) && \
663	663	av_pix_fmt_desc_get(x)->nb_components <= 2)
664	664	#else
665	665	#define isGray(x) \
@@ -759,7 +759,7 @@ static av_always_inline int isPacked(enum AVPixelFormat pix_fmt) · 93 unmodified lines
759	759	{
760	760	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
761	761	av_assert0(desc);
762		− return ((desc->nb_components >= 2 && !(desc->flags & PIX_FMT_PLANAR)) \|\|
	762	+ return ((desc->nb_components >= 2 && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) \|\|
763	763	pix_fmt == AV_PIX_FMT_PAL8);
764	764	}
765	765
@@ -768,29 +768,29 @@ static av_always_inline int isPlanar(enum AVPixelFormat pix_fmt) · 2 unmodified lines
768	768	{
769	769	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
770	770	av_assert0(desc);
771		− return (desc->nb_components >= 2 && (desc->flags & PIX_FMT_PLANAR));
	771	+ return (desc->nb_components >= 2 && (desc->flags & AV_PIX_FMT_FLAG_PLANAR));
772	772	}
773	773
774	774	static av_always_inline int isPackedRGB(enum AVPixelFormat pix_fmt)
775	775	{
776	776	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
777	777	av_assert0(desc);
778		− return ((desc->flags & (PIX_FMT_PLANAR \| PIX_FMT_RGB)) == PIX_FMT_RGB);
	778	+ return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB)) == AV_PIX_FMT_FLAG_RGB);
779	779	}
780	780
781	781	static av_always_inline int isPlanarRGB(enum AVPixelFormat pix_fmt)
782	782	{
783	783	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
784	784	av_assert0(desc);
785		− return ((desc->flags & (PIX_FMT_PLANAR \| PIX_FMT_RGB)) ==
786		− (PIX_FMT_PLANAR \| PIX_FMT_RGB));
	785	+ return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB)) ==
	786	+ (AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB));
787	787	}
788	788
789	789	static av_always_inline int usePal(enum AVPixelFormat pix_fmt)
790	790	{
791	791	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
792	792	av_assert0(desc);
793		− return (desc->flags & PIX_FMT_PAL) \|\| (desc->flags & PIX_FMT_PSEUDOPAL);
	793	+ return (desc->flags & AV_PIX_FMT_FLAG_PAL) \|\| (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL);
794	794	}
795	795
796	796	extern const uint64_t ff_dither4[2];

libswscale/swscale_unscaled.c+1−1

@@ -615,7 +615,7 @@ static rgbConvFn findRgbConvFn(SwsContext *c) · 614 unmodified lines
615	615
616	616	#define IS_NOT_NE(bpp, desc) \
617	617	(((bpp + 7) >> 3) == 2 && \
618		− (!(desc->flags & PIX_FMT_BE) != !HAVE_BIGENDIAN))
	618	+ (!(desc->flags & AV_PIX_FMT_FLAG_BE) != !HAVE_BIGENDIAN))
619	619
620	620	#define CONV_IS(src, dst) (srcFormat == AV_PIX_FMT_##src && dstFormat == AV_PIX_FMT_##dst)
621	621

Merge remote-tracking branch 'qatar/master'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code