lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields

The new fields can be accessed directly and are more intelligible.

Vittorio Giovara committed 11 years ago

Commit 2268db21 parent 6b3ef7f19 files · +423 −402Browse files

Unified · Split

19 files

doc/APIchanges +2 −0
libavcodec/hevc.c +1 −1
libavcodec/hevc_refs.c +1 −1
libavcodec/imgconvert.c +1 −1
libavcodec/libopenjpegdec.c +5 −5
libavcodec/libopenjpegenc.c +2 −2
libavcodec/libx265.c +2 −2
libavcodec/pnmenc.c +1 −1
libavfilter/vf_hqdn3d.c +1 −1
libavfilter/vf_yadif.c +2 −2
libavutil/imgutils.c +5 −5
libavutil/pixdesc.c +365 −359
libavutil/pixdesc.h +17 −6
libavutil/version.h +3 −0
libswscale/output.c +2 −2
libswscale/swscale.c +3 −4
libswscale/swscale_internal.h +2 −2
libswscale/swscale_unscaled.c +6 −6
libswscale/utils.c +2 −2

@@ -17,6 +17,8 @@ API changes, most recent first: · 16 unmodified lines
17	17	xxxxxxx - Change type of AVPixFmtDescriptor.flags from uint8_t to uint64_t.
18	18	xxxxxxx - Change type of AVComponentDescriptor fields from uint16_t to int
19	19	and drop bit packing.
	20	+ xxxxxxx - Add step, offset, and depth to AVComponentDescriptor to replace
	21	+ the deprecated step_minus1, offset_plus1, and depth_minus1.
20	22
21	23	2015-xx-xx - lavu 54.17.0
22	24	xxxxxxx - Add av_blowfish_alloc().

libavcodec/hevc.c+1−1

@@ -2620,7 +2620,7 @@ static int verify_md5(HEVCContext s, AVFrame frame) · 2619 unmodified lines
2620	2620	if (!desc)
2621	2621	return AVERROR(EINVAL);
2622	2622
2623		− pixel_shift = desc->comp[0].depth_minus1 > 7;
	2623	+ pixel_shift = desc->comp[0].depth > 8;
2624	2624
2625	2625	av_log(s->avctx, AV_LOG_DEBUG, "Verifying checksum for frame with POC %d: ",
2626	2626	s->poc);

libavcodec/hevc_refs.c+1−1

@@ -198,7 +198,7 @@ int ff_hevc_output_frame(HEVCContext s, AVFrame out, int flush) · 197 unmodified lines
198	198	if (!desc)
199	199	return AVERROR_BUG;
200	200
201		− pixel_shift = desc->comp[0].depth_minus1 > 7;
	201	+ pixel_shift = desc->comp[0].depth > 8;
202	202
203	203	ret = av_frame_ref(out, frame->frame);
204	204	ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);

libavcodec/imgconvert.c+1−1

@@ -67,7 +67,7 @@ int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, · 66 unmodified lines
67	67	return 0;
68	68
69	69	for (i = 0; i < nb_components; i++)
70		− if (src_desc->comp[i].depth_minus1 > dst_desc->comp[i].depth_minus1)
	70	+ if (src_desc->comp[i].depth > dst_desc->comp[i].depth)
71	71	loss \|= FF_LOSS_DEPTH;
72	72
73	73	if (dst_desc->log2_chroma_w > src_desc->log2_chroma_w \|\|

libavcodec/libopenjpegdec.c+5−5

@@ -94,22 +94,22 @@ static int libopenjpeg_matches_pix_fmt(const opj_image_t *img, · 93 unmodified lines
94	94	switch (desc->nb_components) {
95	95	case 4:
96	96	match = match &&
97		− desc->comp[3].depth_minus1 + 1 >= img->comps[3].prec &&
	97	+ desc->comp[3].depth >= img->comps[3].prec &&
98	98	1 == img->comps[3].dx &&
99	99	1 == img->comps[3].dy;
100	100	case 3:
101	101	match = match &&
102		− desc->comp[2].depth_minus1 + 1 >= img->comps[2].prec &&
	102	+ desc->comp[2].depth >= img->comps[2].prec &&
103	103	1 << desc->log2_chroma_w == img->comps[2].dx &&
104	104	1 << desc->log2_chroma_h == img->comps[2].dy;
105	105	case 2:
106	106	match = match &&
107		− desc->comp[1].depth_minus1 + 1 >= img->comps[1].prec &&
	107	+ desc->comp[1].depth >= img->comps[1].prec &&
108	108	1 << desc->log2_chroma_w == img->comps[1].dx &&
109	109	1 << desc->log2_chroma_h == img->comps[1].dy;
110	110	case 1:
111	111	match = match &&
112		− desc->comp[0].depth_minus1 + 1 >= img->comps[0].prec &&
	112	+ desc->comp[0].depth >= img->comps[0].prec &&
113	113	1 == img->comps[0].dx &&
114	114	1 == img->comps[0].dy;
115	115	default:
@@ -365,7 +365,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, · 249 unmodified lines
365	365	}
366	366
367	367	desc = av_pix_fmt_desc_get(avctx->pix_fmt);
368		− pixel_size = desc->comp[0].step_minus1 + 1;
	368	+ pixel_size = desc->comp[0].step;
369	369	ispacked = libopenjpeg_ispacked(avctx->pix_fmt);
370	370
371	371	switch (pixel_size) {

libavcodec/libopenjpegenc.c+2−2

@@ -131,8 +131,8 @@ static opj_image_t libopenjpeg_create_image(AVCodecContext avctx, · 130 unmodified lines
131	131	}
132	132
133	133	for (i = 0; i < numcomps; i++) {
134		− cmptparm[i].prec = desc->comp[i].depth_minus1 + 1;
135		− cmptparm[i].bpp = desc->comp[i].depth_minus1 + 1;
	134	+ cmptparm[i].prec = desc->comp[i].depth;
	135	+ cmptparm[i].bpp = desc->comp[i].depth;
136	136	cmptparm[i].sgnd = 0;
137	137	cmptparm[i].dx = sub_dx[i];
138	138	cmptparm[i].dy = sub_dy[i];

libavcodec/libx265.c+2−2

@@ -78,7 +78,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) · 77 unmodified lines
78	78	{
79	79	libx265Context *ctx = avctx->priv_data;
80	80
81		− ctx->api = x265_api_get(av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1);
	81	+ ctx->api = x265_api_get(av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth);
82	82	if (!ctx->api)
83	83	ctx->api = x265_api_get(0);
84	84
@@ -261,7 +261,7 @@ static int libx265_encode_frame(AVCodecContext avctx, AVPacket pkt, · 176 unmodified lines
261	261	}
262	262
263	263	x265pic.pts = pic->pts;
264		− x265pic.bitDepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1;
	264	+ x265pic.bitDepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth;
265	265
266	266	x265pic.sliceType = pic->pict_type == AV_PICTURE_TYPE_I ? X265_TYPE_I :
267	267	pic->pict_type == AV_PICTURE_TYPE_P ? X265_TYPE_P :

libavcodec/pnmenc.c+1−1

@@ -83,7 +83,7 @@ static int pnm_encode_frame(AVCodecContext avctx, AVPacket pkt, · 82 unmodified lines
83	83	"P%c\n%d %d\n", c, avctx->width, h1);
84	84	bytestream += strlen(bytestream);
85	85	if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) {
86		− int maxdepth = (1 << (av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1)) - 1;
	86	+ int maxdepth = (1 << av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth) - 1;
87	87	snprintf(bytestream, bytestream_end - bytestream,
88	88	"%d\n", maxdepth);
89	89	bytestream += strlen(bytestream);

libavfilter/vf_hqdn3d.c+1−1

@@ -269,7 +269,7 @@ static int config_input(AVFilterLink *inlink) · 268 unmodified lines
269	269
270	270	s->hsub = desc->log2_chroma_w;
271	271	s->vsub = desc->log2_chroma_h;
272		− s->depth = desc->comp[0].depth_minus1+1;
	272	+ s->depth = desc->comp[0].depth;
273	273
274	274	s->line = av_malloc(inlink->w * sizeof(*s->line));
275	275	if (!s->line)

libavfilter/vf_yadif.c+2−2

@@ -186,7 +186,7 @@ static int filter_slice(AVFilterContext ctx, void arg, int jobnr, int nb_jobs) · 185 unmodified lines
186	186	YADIFContext *s = ctx->priv;
187	187	ThreadData *td = arg;
188	188	int refs = s->cur->linesize[td->plane];
189		− int df = (s->csp->comp[td->plane].depth_minus1 + 8) / 8;
	189	+ int df = (s->csp->comp[td->plane].depth + 7) / 8;
190	190	int pix_3 = 3 * df;
191	191	int slice_h = td->h / nb_jobs;
192	192	int slice_start = jobnr * slice_h;
@@ -463,7 +463,7 @@ static int config_props(AVFilterLink *link) · 270 unmodified lines
463	463	link->h = link->src->inputs[0]->h;
464	464
465	465	s->csp = av_pix_fmt_desc_get(link->format);
466		− if (s->csp->comp[0].depth_minus1 / 8 == 1) {
	466	+ if (s->csp->comp[0].depth > 8) {
467	467	s->filter_line = filter_line_c_16bit;
468	468	s->filter_edges = filter_edges_16bit;
469	469	} else {

libavutil/imgutils.c+5−5

@@ -40,8 +40,8 @@ void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], · 39 unmodified lines
40	40
41	41	for (i = 0; i < 4; i++) {
42	42	const AVComponentDescriptor *comp = &(pixdesc->comp[i]);
43		− if ((comp->step_minus1+1) > max_pixsteps[comp->plane]) {
44		− max_pixsteps[comp->plane] = comp->step_minus1+1;
	43	+ if (comp->step > max_pixsteps[comp->plane]) {
	44	+ max_pixsteps[comp->plane] = comp->step;
45	45	if (max_pixstep_comps)
46	46	max_pixstep_comps[comp->plane] = i;
47	47	}
@@ -59,7 +59,7 @@ int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane) · 11 unmodified lines
59	59	return AVERROR(EINVAL);
60	60
61	61	if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM)
62		− return (width * (desc->comp[0].step_minus1+1) + 7) >> 3;
	62	+ return (width * desc->comp[0].step + 7) >> 3;
63	63
64	64	av_image_fill_max_pixsteps(max_step, max_step_comp, desc);
65	65	s = (max_step_comp[plane] == 1 \|\| max_step_comp[plane] == 2) ? desc->log2_chroma_w : 0;
@@ -79,9 +79,9 @@ int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int wi · 13 unmodified lines
79	79	return AVERROR(EINVAL);
80	80
81	81	if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) {
82		− if (width > (INT_MAX -7) / (desc->comp[0].step_minus1+1))
	82	+ if (width > (INT_MAX - 7) / desc->comp[0].step)
83	83	return AVERROR(EINVAL);
84		− linesizes[0] = (width * (desc->comp[0].step_minus1+1) + 7) >> 3;
	84	+ linesizes[0] = (width * desc->comp[0].step + 7) >> 3;
85	85	return 0;
86	86	}
87	87

libavutil/pixdesc.c+365−359

@@ -38,14 +38,14 @@ void av_read_image_line(uint16_t *dst, · 37 unmodified lines
38	38	{
39	39	AVComponentDescriptor comp = desc->comp[c];
40	40	int plane = comp.plane;
41		− int depth = comp.depth_minus1 + 1;
	41	+ int depth = comp.depth;
42	42	int mask = (1 << depth) - 1;
43	43	int shift = comp.shift;
44		− int step = comp.step_minus1 + 1;
	44	+ int step = comp.step;
45	45	int flags = desc->flags;
46	46
47	47	if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
48		− int skip = x * step + comp.offset_plus1 - 1;
	48	+ int skip = x * step + comp.offset;
49	49	const uint8_t p = data[plane] + y linesize[plane] + (skip >> 3);
50	50	int shift = 8 - depth - (skip & 7);
51	51
@@ -60,7 +60,7 @@ void av_read_image_line(uint16_t *dst, · 8 unmodified lines
60	60	}
61	61	} else {
62	62	const uint8_t p = data[plane] + y linesize[plane] +
63		− x * step + comp.offset_plus1 - 1;
	63	+ x * step + comp.offset;
64	64	int is_8bit = shift + depth <= 8;
65	65
66	66	if (is_8bit)
@@ -85,12 +85,12 @@ void av_write_image_line(const uint16_t *src, · 18 unmodified lines
85	85	{
86	86	AVComponentDescriptor comp = desc->comp[c];
87	87	int plane = comp.plane;
88		− int depth = comp.depth_minus1 + 1;
89		− int step = comp.step_minus1 + 1;
	88	+ int depth = comp.depth;
	89	+ int step = comp.step;
90	90	int flags = desc->flags;
91	91
92	92	if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
93		− int skip = x * step + comp.offset_plus1 - 1;
	93	+ int skip = x * step + comp.offset;
94	94	uint8_t p = data[plane] + y linesize[plane] + (skip >> 3);
95	95	int shift = 8 - depth - (skip & 7);
96	96
@@ -103,7 +103,7 @@ void av_write_image_line(const uint16_t *src, · 6 unmodified lines
103	103	} else {
104	104	int shift = comp.shift;
105	105	uint8_t p = data[plane] + y linesize[plane] +
106		− x * step + comp.offset_plus1 - 1;
	106	+ x * step + comp.offset;
107	107
108	108	if (shift + depth <= 8) {
109	109	p += !!(flags & AV_PIX_FMT_FLAG_BE);
@@ -126,6 +126,9 @@ void av_write_image_line(const uint16_t *src, · 16 unmodified lines
126	126	}
127	127	}
128	128
	129	+#if FF_API_PLUS1_MINUS1
	130	+FF_DISABLE_DEPRECATION_WARNINGS
	131	+#endif
129	132	static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
130	133	[AV_PIX_FMT_YUV420P] = {
131	134	.name = "yuv420p",
@@ -133,9 +136,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1 unmodified line
133	136	.log2_chroma_w = 1,
134	137	.log2_chroma_h = 1,
135	138	.comp = {
136		− { 0, 0, 1, 0, 7 }, /* Y */
137		− { 1, 0, 1, 0, 7 }, /* U */
138		− { 2, 0, 1, 0, 7 }, /* V */
	139	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	140	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	141	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
139	142	},
140	143	.flags = AV_PIX_FMT_FLAG_PLANAR,
141	144	},
@@ -145,9 +148,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
145	148	.log2_chroma_w = 1,
146	149	.log2_chroma_h = 0,
147	150	.comp = {
148		− { 0, 1, 1, 0, 7 }, /* Y */
149		− { 0, 3, 2, 0, 7 }, /* U */
150		− { 0, 3, 4, 0, 7 }, /* V */
	151	+ { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
	152	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* U */
	153	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* V */
151	154	},
152	155	},
153	156	[AV_PIX_FMT_YVYU422] = {
@@ -156,9 +159,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
156	159	.log2_chroma_w = 1,
157	160	.log2_chroma_h = 0,
158	161	.comp = {
159		− { 0, 1, 1, 0, 7 }, /* Y */
160		− { 0, 3, 2, 0, 7 }, /* V */
161		− { 0, 3, 4, 0, 7 }, /* U */
	162	+ { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
	163	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* V */
	164	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* U */
162	165	},
163	166	},
164	167	[AV_PIX_FMT_RGB24] = {
@@ -167,9 +170,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
167	170	.log2_chroma_w = 0,
168	171	.log2_chroma_h = 0,
169	172	.comp = {
170		− { 0, 2, 1, 0, 7 }, /* R */
171		− { 0, 2, 2, 0, 7 }, /* G */
172		− { 0, 2, 3, 0, 7 }, /* B */
	173	+ { 0, 3, 0, 0, 8, 2, 7, 1 }, /* R */
	174	+ { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */
	175	+ { 0, 3, 2, 0, 8, 2, 7, 3 }, /* B */
173	176	},
174	177	.flags = AV_PIX_FMT_FLAG_RGB,
175	178	},
@@ -179,9 +182,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
179	182	.log2_chroma_w = 0,
180	183	.log2_chroma_h = 0,
181	184	.comp = {
182		− { 0, 2, 1, 0, 7 }, /* B */
183		− { 0, 2, 2, 0, 7 }, /* G */
184		− { 0, 2, 3, 0, 7 }, /* R */
	185	+ { 0, 3, 0, 0, 8, 2, 7, 1 }, /* B */
	186	+ { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */
	187	+ { 0, 3, 2, 0, 8, 2, 7, 3 }, /* R */
185	188	},
186	189	.flags = AV_PIX_FMT_FLAG_RGB,
187	190	},
@@ -191,9 +194,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
191	194	.log2_chroma_w = 1,
192	195	.log2_chroma_h = 0,
193	196	.comp = {
194		− { 0, 0, 1, 0, 7 }, /* Y */
195		− { 1, 0, 1, 0, 7 }, /* U */
196		− { 2, 0, 1, 0, 7 }, /* V */
	197	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	198	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	199	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
197	200	},
198	201	.flags = AV_PIX_FMT_FLAG_PLANAR,
199	202	},
@@ -203,9 +206,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
203	206	.log2_chroma_w = 0,
204	207	.log2_chroma_h = 0,
205	208	.comp = {
206		− { 0, 0, 1, 0, 7 }, /* Y */
207		− { 1, 0, 1, 0, 7 }, /* U */
208		− { 2, 0, 1, 0, 7 }, /* V */
	209	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	210	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	211	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
209	212	},
210	213	.flags = AV_PIX_FMT_FLAG_PLANAR,
211	214	},
@@ -215,9 +218,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
215	218	.log2_chroma_w = 2,
216	219	.log2_chroma_h = 2,
217	220	.comp = {
218		− { 0, 0, 1, 0, 7 }, /* Y */
219		− { 1, 0, 1, 0, 7 }, /* U */
220		− { 2, 0, 1, 0, 7 }, /* V */
	221	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	222	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	223	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
221	224	},
222	225	.flags = AV_PIX_FMT_FLAG_PLANAR,
223	226	},
@@ -227,9 +230,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
227	230	.log2_chroma_w = 2,
228	231	.log2_chroma_h = 0,
229	232	.comp = {
230		− { 0, 0, 1, 0, 7 }, /* Y */
231		− { 1, 0, 1, 0, 7 }, /* U */
232		− { 2, 0, 1, 0, 7 }, /* V */
	233	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	234	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	235	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
233	236	},
234	237	.flags = AV_PIX_FMT_FLAG_PLANAR,
235	238	},
@@ -239,7 +242,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
239	242	.log2_chroma_w = 0,
240	243	.log2_chroma_h = 0,
241	244	.comp = {
242		− { 0, 0, 1, 0, 7 }, /* Y */
	245	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
243	246	},
244	247	.flags = AV_PIX_FMT_FLAG_PSEUDOPAL,
245	248	.alias = "gray8,y8",
@@ -250,7 +253,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
250	253	.log2_chroma_w = 0,
251	254	.log2_chroma_h = 0,
252	255	.comp = {
253		− { 0, 0, 1, 0, 0 }, /* Y */
	256	+ { 0, 1, 0, 0, 1, 0, 0, 1 }, /* Y */
254	257	},
255	258	.flags = AV_PIX_FMT_FLAG_BITSTREAM,
256	259	},
@@ -260,7 +263,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
260	263	.log2_chroma_w = 0,
261	264	.log2_chroma_h = 0,
262	265	.comp = {
263		− { 0, 0, 1, 7, 0 }, /* Y */
	266	+ { 0, 1, 0, 7, 1, 0, 0, 1 }, /* Y */
264	267	},
265	268	.flags = AV_PIX_FMT_FLAG_BITSTREAM,
266	269	},
@@ -270,7 +273,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
270	273	.log2_chroma_w = 0,
271	274	.log2_chroma_h = 0,
272	275	.comp = {
273		− { 0, 0, 1, 0, 7 },
	276	+ { 0, 1, 0, 0, 8, 0, 7, 1 },
274	277	},
275	278	.flags = AV_PIX_FMT_FLAG_PAL,
276	279	},
@@ -280,9 +283,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
280	283	.log2_chroma_w = 1,
281	284	.log2_chroma_h = 1,
282	285	.comp = {
283		− { 0, 0, 1, 0, 7 }, /* Y */
284		− { 1, 0, 1, 0, 7 }, /* U */
285		− { 2, 0, 1, 0, 7 }, /* V */
	286	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	287	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	288	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
286	289	},
287	290	.flags = AV_PIX_FMT_FLAG_PLANAR,
288	291	},
@@ -292,9 +295,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
292	295	.log2_chroma_w = 1,
293	296	.log2_chroma_h = 0,
294	297	.comp = {
295		− { 0, 0, 1, 0, 7 }, /* Y */
296		− { 1, 0, 1, 0, 7 }, /* U */
297		− { 2, 0, 1, 0, 7 }, /* V */
	298	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	299	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	300	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
298	301	},
299	302	.flags = AV_PIX_FMT_FLAG_PLANAR,
300	303	},
@@ -304,9 +307,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
304	307	.log2_chroma_w = 0,
305	308	.log2_chroma_h = 0,
306	309	.comp = {
307		− {0, 0, 1, 0, 7}, /* Y */
308		− {1, 0, 1, 0, 7}, /* U */
309		− {2, 0, 1, 0, 7}, /* V */
	310	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	311	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	312	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
310	313	},
311	314	.flags = AV_PIX_FMT_FLAG_PLANAR,
312	315	},
@@ -326,9 +329,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 13 unmodified lines
326	329	.log2_chroma_w = 1,
327	330	.log2_chroma_h = 0,
328	331	.comp = {
329		− { 0, 1, 2, 0, 7 }, /* Y */
330		− { 0, 3, 1, 0, 7 }, /* U */
331		− { 0, 3, 3, 0, 7 }, /* V */
	332	+ { 0, 2, 1, 0, 8, 1, 7, 2 }, /* Y */
	333	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* U */
	334	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* V */
332	335	},
333	336	},
334	337	[AV_PIX_FMT_UYYVYY411] = {
@@ -337,9 +340,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
337	340	.log2_chroma_w = 2,
338	341	.log2_chroma_h = 0,
339	342	.comp = {
340		− { 0, 3, 2, 0, 7 }, /* Y */
341		− { 0, 5, 1, 0, 7 }, /* U */
342		− { 0, 5, 4, 0, 7 }, /* V */
	343	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* Y */
	344	+ { 0, 6, 0, 0, 8, 5, 7, 1 }, /* U */
	345	+ { 0, 6, 3, 0, 8, 5, 7, 4 }, /* V */
343	346	},
344	347	},
345	348	[AV_PIX_FMT_BGR8] = {
@@ -348,9 +351,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
348	351	.log2_chroma_w = 0,
349	352	.log2_chroma_h = 0,
350	353	.comp = {
351		− { 0, 0, 1, 6, 1 }, /* B */
352		− { 0, 0, 1, 3, 2 }, /* G */
353		− { 0, 0, 1, 0, 2 }, /* R */
	354	+ { 0, 1, 0, 6, 2, 0, 1, 1 }, /* B */
	355	+ { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */
	356	+ { 0, 1, 0, 0, 3, 0, 2, 1 }, /* R */
354	357	},
355	358	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
356	359	},
@@ -360,9 +363,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
360	363	.log2_chroma_w = 0,
361	364	.log2_chroma_h = 0,
362	365	.comp = {
363		− { 0, 3, 1, 0, 0 }, /* B */
364		− { 0, 3, 2, 0, 1 }, /* G */
365		− { 0, 3, 4, 0, 0 }, /* R */
	366	+ { 0, 4, 0, 0, 1, 3, 0, 1 }, /* B */
	367	+ { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */
	368	+ { 0, 4, 3, 0, 1, 3, 0, 4 }, /* R */
366	369	},
367	370	.flags = AV_PIX_FMT_FLAG_BITSTREAM \| AV_PIX_FMT_FLAG_RGB,
368	371	},
@@ -372,9 +375,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
372	375	.log2_chroma_w = 0,
373	376	.log2_chroma_h = 0,
374	377	.comp = {
375		− { 0, 0, 1, 3, 0 }, /* B */
376		− { 0, 0, 1, 1, 1 }, /* G */
377		− { 0, 0, 1, 0, 0 }, /* R */
	378	+ { 0, 1, 0, 3, 1, 0, 0, 1 }, /* B */
	379	+ { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */
	380	+ { 0, 1, 0, 0, 1, 0, 0, 1 }, /* R */
378	381	},
379	382	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
380	383	},
@@ -384,9 +387,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
384	387	.log2_chroma_w = 0,
385	388	.log2_chroma_h = 0,
386	389	.comp = {
387		− { 0, 0, 1, 6, 1 }, /* R */
388		− { 0, 0, 1, 3, 2 }, /* G */
389		− { 0, 0, 1, 0, 2 }, /* B */
	390	+ { 0, 1, 0, 6, 2, 0, 1, 1 }, /* R */
	391	+ { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */
	392	+ { 0, 1, 0, 0, 3, 0, 2, 1 }, /* B */
390	393	},
391	394	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
392	395	},
@@ -396,9 +399,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
396	399	.log2_chroma_w = 0,
397	400	.log2_chroma_h = 0,
398	401	.comp = {
399		− { 0, 3, 1, 0, 0 }, /* R */
400		− { 0, 3, 2, 0, 1 }, /* G */
401		− { 0, 3, 4, 0, 0 }, /* B */
	402	+ { 0, 4, 0, 0, 1, 3, 0, 1 }, /* R */
	403	+ { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */
	404	+ { 0, 4, 3, 0, 1, 3, 0, 4 }, /* B */
402	405	},
403	406	.flags = AV_PIX_FMT_FLAG_BITSTREAM \| AV_PIX_FMT_FLAG_RGB,
404	407	},
@@ -408,9 +411,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
408	411	.log2_chroma_w = 0,
409	412	.log2_chroma_h = 0,
410	413	.comp = {
411		− { 0, 0, 1, 3, 0 }, /* R */
412		− { 0, 0, 1, 1, 1 }, /* G */
413		− { 0, 0, 1, 0, 0 }, /* B */
	414	+ { 0, 1, 0, 3, 1, 0, 0, 1 }, /* R */
	415	+ { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */
	416	+ { 0, 1, 0, 0, 1, 0, 0, 1 }, /* B */
414	417	},
415	418	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
416	419	},
@@ -420,9 +423,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
420	423	.log2_chroma_w = 1,
421	424	.log2_chroma_h = 1,
422	425	.comp = {
423		− { 0, 0, 1, 0, 7 }, /* Y */
424		− { 1, 1, 1, 0, 7 }, /* U */
425		− { 1, 1, 2, 0, 7 }, /* V */
	426	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	427	+ { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */
	428	+ { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */
426	429	},
427	430	.flags = AV_PIX_FMT_FLAG_PLANAR,
428	431	},
@@ -432,9 +435,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
432	435	.log2_chroma_w = 1,
433	436	.log2_chroma_h = 1,
434	437	.comp = {
435		− { 0, 0, 1, 0, 7 }, /* Y */
436		− { 1, 1, 1, 0, 7 }, /* V */
437		− { 1, 1, 2, 0, 7 }, /* U */
	438	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	439	+ { 1, 2, 0, 0, 8, 1, 7, 1 }, /* V */
	440	+ { 1, 2, 1, 0, 8, 1, 7, 2 }, /* U */
438	441	},
439	442	.flags = AV_PIX_FMT_FLAG_PLANAR,
440	443	},
@@ -444,10 +447,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
444	447	.log2_chroma_w = 0,
445	448	.log2_chroma_h = 0,
446	449	.comp = {
447		− { 0, 3, 1, 0, 7 }, /* A */
448		− { 0, 3, 2, 0, 7 }, /* R */
449		− { 0, 3, 3, 0, 7 }, /* G */
450		− { 0, 3, 4, 0, 7 }, /* B */
	450	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */
	451	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */
	452	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
	453	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */
451	454	},
452	455	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
453	456	},
@@ -457,10 +460,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
457	460	.log2_chroma_w = 0,
458	461	.log2_chroma_h = 0,
459	462	.comp = {
460		− { 0, 3, 1, 0, 7 }, /* R */
461		− { 0, 3, 2, 0, 7 }, /* G */
462		− { 0, 3, 3, 0, 7 }, /* B */
463		− { 0, 3, 4, 0, 7 }, /* A */
	463	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */
	464	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
	465	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */
	466	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */
464	467	},
465	468	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
466	469	},
@@ -470,10 +473,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
470	473	.log2_chroma_w = 0,
471	474	.log2_chroma_h = 0,
472	475	.comp = {
473		− { 0, 3, 1, 0, 7 }, /* A */
474		− { 0, 3, 2, 0, 7 }, /* B */
475		− { 0, 3, 3, 0, 7 }, /* G */
476		− { 0, 3, 4, 0, 7 }, /* R */
	476	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */
	477	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */
	478	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
	479	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */
477	480	},
478	481	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
479	482	},
@@ -483,10 +486,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
483	486	.log2_chroma_w = 0,
484	487	.log2_chroma_h = 0,
485	488	.comp = {
486		− { 0, 3, 1, 0, 7 }, /* B */
487		− { 0, 3, 2, 0, 7 }, /* G */
488		− { 0, 3, 3, 0, 7 }, /* R */
489		− { 0, 3, 4, 0, 7 }, /* A */
	489	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */
	490	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
	491	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */
	492	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */
490	493	},
491	494	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
492	495	},
@@ -496,7 +499,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
496	499	.log2_chroma_w = 0,
497	500	.log2_chroma_h = 0,
498	501	.comp = {
499		− { 0, 1, 1, 0, 15 }, /* Y */
	502	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
500	503	},
501	504	.flags = AV_PIX_FMT_FLAG_BE,
502	505	.alias = "y16be",
@@ -507,7 +510,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
507	510	.log2_chroma_w = 0,
508	511	.log2_chroma_h = 0,
509	512	.comp = {
510		− { 0, 1, 1, 0, 15 }, /* Y */
	513	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
511	514	},
512	515	.alias = "y16le",
513	516	},
@@ -517,9 +520,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
517	520	.log2_chroma_w = 0,
518	521	.log2_chroma_h = 1,
519	522	.comp = {
520		− { 0, 0, 1, 0, 7 }, /* Y */
521		− { 1, 0, 1, 0, 7 }, /* U */
522		− { 2, 0, 1, 0, 7 }, /* V */
	523	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	524	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	525	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
523	526	},
524	527	.flags = AV_PIX_FMT_FLAG_PLANAR,
525	528	},
@@ -529,9 +532,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
529	532	.log2_chroma_w = 0,
530	533	.log2_chroma_h = 1,
531	534	.comp = {
532		− { 0, 0, 1, 0, 7 }, /* Y */
533		− { 1, 0, 1, 0, 7 }, /* U */
534		− { 2, 0, 1, 0, 7 }, /* V */
	535	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	536	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	537	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
535	538	},
536	539	.flags = AV_PIX_FMT_FLAG_PLANAR,
537	540	},
@@ -541,10 +544,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
541	544	.log2_chroma_w = 1,
542	545	.log2_chroma_h = 1,
543	546	.comp = {
544		− { 0, 0, 1, 0, 7 }, /* Y */
545		− { 1, 0, 1, 0, 7 }, /* U */
546		− { 2, 0, 1, 0, 7 }, /* V */
547		− { 3, 0, 1, 0, 7 }, /* A */
	547	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	548	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	549	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
	550	+ { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
548	551	},
549	552	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
550	553	},
@@ -554,10 +557,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
554	557	.log2_chroma_w = 1,
555	558	.log2_chroma_h = 0,
556	559	.comp = {
557		− { 0, 0, 1, 0, 7 }, /* Y */
558		− { 1, 0, 1, 0, 7 }, /* U */
559		− { 2, 0, 1, 0, 7 }, /* V */
560		− { 3, 0, 1, 0, 7 }, /* A */
	560	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	561	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	562	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
	563	+ { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
561	564	},
562	565	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
563	566	},
@@ -567,10 +570,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
567	570	.log2_chroma_w = 0,
568	571	.log2_chroma_h = 0,
569	572	.comp = {
570		− { 0, 0, 1, 0, 7 }, /* Y */
571		− { 1, 0, 1, 0, 7 }, /* U */
572		− { 2, 0, 1, 0, 7 }, /* V */
573		− { 3, 0, 1, 0, 7 }, /* A */
	573	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	574	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	575	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
	576	+ { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
574	577	},
575	578	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
576	579	},
@@ -580,10 +583,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
580	583	.log2_chroma_w = 1,
581	584	.log2_chroma_h = 1,
582	585	.comp = {
583		− { 0, 1, 1, 0, 8 }, /* Y */
584		− { 1, 1, 1, 0, 8 }, /* U */
585		− { 2, 1, 1, 0, 8 }, /* V */
586		− { 3, 1, 1, 0, 8 }, /* A */
	586	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	587	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	588	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	589	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
587	590	},
588	591	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
589	592	},
@@ -593,10 +596,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
593	596	.log2_chroma_w = 1,
594	597	.log2_chroma_h = 1,
595	598	.comp = {
596		− { 0, 1, 1, 0, 8 }, /* Y */
597		− { 1, 1, 1, 0, 8 }, /* U */
598		− { 2, 1, 1, 0, 8 }, /* V */
599		− { 3, 1, 1, 0, 8 }, /* A */
	599	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	600	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	601	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	602	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
600	603	},
601	604	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
602	605	},
@@ -606,10 +609,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
606	609	.log2_chroma_w = 1,
607	610	.log2_chroma_h = 0,
608	611	.comp = {
609		− { 0, 1, 1, 0, 8 }, /* Y */
610		− { 1, 1, 1, 0, 8 }, /* U */
611		− { 2, 1, 1, 0, 8 }, /* V */
612		− { 3, 1, 1, 0, 8 }, /* A */
	612	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	613	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	614	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	615	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
613	616	},
614	617	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
615	618	},
@@ -619,10 +622,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
619	622	.log2_chroma_w = 1,
620	623	.log2_chroma_h = 0,
621	624	.comp = {
622		− { 0, 1, 1, 0, 8 }, /* Y */
623		− { 1, 1, 1, 0, 8 }, /* U */
624		− { 2, 1, 1, 0, 8 }, /* V */
625		− { 3, 1, 1, 0, 8 }, /* A */
	625	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	626	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	627	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	628	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
626	629	},
627	630	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
628	631	},
@@ -632,10 +635,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
632	635	.log2_chroma_w = 0,
633	636	.log2_chroma_h = 0,
634	637	.comp = {
635		− { 0, 1, 1, 0, 8 }, /* Y */
636		− { 1, 1, 1, 0, 8 }, /* U */
637		− { 2, 1, 1, 0, 8 }, /* V */
638		− { 3, 1, 1, 0, 8 }, /* A */
	638	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	639	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	640	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	641	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
639	642	},
640	643	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
641	644	},
@@ -645,10 +648,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
645	648	.log2_chroma_w = 0,
646	649	.log2_chroma_h = 0,
647	650	.comp = {
648		− { 0, 1, 1, 0, 8 }, /* Y */
649		− { 1, 1, 1, 0, 8 }, /* U */
650		− { 2, 1, 1, 0, 8 }, /* V */
651		− { 3, 1, 1, 0, 8 }, /* A */
	651	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	652	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	653	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	654	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
652	655	},
653	656	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
654	657	},
@@ -658,10 +661,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
658	661	.log2_chroma_w = 1,
659	662	.log2_chroma_h = 1,
660	663	.comp = {
661		− { 0, 1, 1, 0, 9 }, /* Y */
662		− { 1, 1, 1, 0, 9 }, /* U */
663		− { 2, 1, 1, 0, 9 }, /* V */
664		− { 3, 1, 1, 0, 9 }, /* A */
	664	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	665	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	666	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	667	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
665	668	},
666	669	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
667	670	},
@@ -671,10 +674,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
671	674	.log2_chroma_w = 1,
672	675	.log2_chroma_h = 1,
673	676	.comp = {
674		− { 0, 1, 1, 0, 9 }, /* Y */
675		− { 1, 1, 1, 0, 9 }, /* U */
676		− { 2, 1, 1, 0, 9 }, /* V */
677		− { 3, 1, 1, 0, 9 }, /* A */
	677	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	678	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	679	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	680	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
678	681	},
679	682	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
680	683	},
@@ -684,10 +687,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
684	687	.log2_chroma_w = 1,
685	688	.log2_chroma_h = 0,
686	689	.comp = {
687		− { 0, 1, 1, 0, 9 }, /* Y */
688		− { 1, 1, 1, 0, 9 }, /* U */
689		− { 2, 1, 1, 0, 9 }, /* V */
690		− { 3, 1, 1, 0, 9 }, /* A */
	690	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	691	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	692	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	693	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
691	694	},
692	695	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
693	696	},
@@ -697,10 +700,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
697	700	.log2_chroma_w = 1,
698	701	.log2_chroma_h = 0,
699	702	.comp = {
700		− { 0, 1, 1, 0, 9 }, /* Y */
701		− { 1, 1, 1, 0, 9 }, /* U */
702		− { 2, 1, 1, 0, 9 }, /* V */
703		− { 3, 1, 1, 0, 9 }, /* A */
	703	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	704	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	705	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	706	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
704	707	},
705	708	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
706	709	},
@@ -710,10 +713,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
710	713	.log2_chroma_w = 0,
711	714	.log2_chroma_h = 0,
712	715	.comp = {
713		− { 0, 1, 1, 0, 9 }, /* Y */
714		− { 1, 1, 1, 0, 9 }, /* U */
715		− { 2, 1, 1, 0, 9 }, /* V */
716		− { 3, 1, 1, 0, 9 }, /* A */
	716	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	717	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	718	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	719	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
717	720	},
718	721	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
719	722	},
@@ -723,10 +726,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
723	726	.log2_chroma_w = 0,
724	727	.log2_chroma_h = 0,
725	728	.comp = {
726		− { 0, 1, 1, 0, 9 }, /* Y */
727		− { 1, 1, 1, 0, 9 }, /* U */
728		− { 2, 1, 1, 0, 9 }, /* V */
729		− { 3, 1, 1, 0, 9 }, /* A */
	729	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	730	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	731	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	732	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
730	733	},
731	734	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
732	735	},
@@ -736,10 +739,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
736	739	.log2_chroma_w = 1,
737	740	.log2_chroma_h = 1,
738	741	.comp = {
739		− { 0, 1, 1, 0, 15 }, /* Y */
740		− { 1, 1, 1, 0, 15 }, /* U */
741		− { 2, 1, 1, 0, 15 }, /* V */
742		− { 3, 1, 1, 0, 15 }, /* A */
	742	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	743	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	744	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	745	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
743	746	},
744	747	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
745	748	},
@@ -749,10 +752,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
749	752	.log2_chroma_w = 1,
750	753	.log2_chroma_h = 1,
751	754	.comp = {
752		− { 0, 1, 1, 0, 15 }, /* Y */
753		− { 1, 1, 1, 0, 15 }, /* U */
754		− { 2, 1, 1, 0, 15 }, /* V */
755		− { 3, 1, 1, 0, 15 }, /* A */
	755	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	756	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	757	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	758	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
756	759	},
757	760	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
758	761	},
@@ -762,10 +765,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
762	765	.log2_chroma_w = 1,
763	766	.log2_chroma_h = 0,
764	767	.comp = {
765		− { 0, 1, 1, 0, 15 }, /* Y */
766		− { 1, 1, 1, 0, 15 }, /* U */
767		− { 2, 1, 1, 0, 15 }, /* V */
768		− { 3, 1, 1, 0, 15 }, /* A */
	768	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	769	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	770	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	771	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
769	772	},
770	773	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
771	774	},
@@ -775,10 +778,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
775	778	.log2_chroma_w = 1,
776	779	.log2_chroma_h = 0,
777	780	.comp = {
778		− { 0, 1, 1, 0, 15 }, /* Y */
779		− { 1, 1, 1, 0, 15 }, /* U */
780		− { 2, 1, 1, 0, 15 }, /* V */
781		− { 3, 1, 1, 0, 15 }, /* A */
	781	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	782	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	783	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	784	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
782	785	},
783	786	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
784	787	},
@@ -788,10 +791,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
788	791	.log2_chroma_w = 0,
789	792	.log2_chroma_h = 0,
790	793	.comp = {
791		− { 0, 1, 1, 0, 15 }, /* Y */
792		− { 1, 1, 1, 0, 15 }, /* U */
793		− { 2, 1, 1, 0, 15 }, /* V */
794		− { 3, 1, 1, 0, 15 }, /* A */
	794	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	795	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	796	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	797	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
795	798	},
796	799	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
797	800	},
@@ -801,10 +804,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
801	804	.log2_chroma_w = 0,
802	805	.log2_chroma_h = 0,
803	806	.comp = {
804		− { 0, 1, 1, 0, 15 }, /* Y */
805		− { 1, 1, 1, 0, 15 }, /* U */
806		− { 2, 1, 1, 0, 15 }, /* V */
807		− { 3, 1, 1, 0, 15 }, /* A */
	807	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	808	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	809	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	810	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
808	811	},
809	812	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
810	813	},
@@ -852,9 +855,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 41 unmodified lines
852	855	.log2_chroma_w = 0,
853	856	.log2_chroma_h = 0,
854	857	.comp = {
855		− { 0, 5, 1, 0, 15 }, /* R */
856		− { 0, 5, 3, 0, 15 }, /* G */
857		− { 0, 5, 5, 0, 15 }, /* B */
	858	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */
	859	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	860	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */
858	861	},
859	862	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_BE,
860	863	},
@@ -864,9 +867,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
864	867	.log2_chroma_w = 0,
865	868	.log2_chroma_h = 0,
866	869	.comp = {
867		− { 0, 5, 1, 0, 15 }, /* R */
868		− { 0, 5, 3, 0, 15 }, /* G */
869		− { 0, 5, 5, 0, 15 }, /* B */
	870	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */
	871	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	872	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */
870	873	},
871	874	.flags = AV_PIX_FMT_FLAG_RGB,
872	875	},
@@ -876,10 +879,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
876	879	.log2_chroma_w = 0,
877	880	.log2_chroma_h = 0,
878	881	.comp = {
879		− { 0, 7, 1, 0, 15 }, /* R */
880		− { 0, 7, 3, 0, 15 }, /* G */
881		− { 0, 7, 5, 0, 15 }, /* B */
882		− { 0, 7, 7, 0, 15 }, /* A */
	882	+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */
	883	+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
	884	+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */
	885	+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
883	886	},
884	887	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
885	888	},
@@ -889,10 +892,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
889	892	.log2_chroma_w = 0,
890	893	.log2_chroma_h = 0,
891	894	.comp = {
892		− { 0, 7, 1, 0, 15 }, /* R */
893		− { 0, 7, 3, 0, 15 }, /* G */
894		− { 0, 7, 5, 0, 15 }, /* B */
895		− { 0, 7, 7, 0, 15 }, /* A */
	895	+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */
	896	+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
	897	+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */
	898	+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
896	899	},
897	900	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
898	901	},
@@ -902,9 +905,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
902	905	.log2_chroma_w = 0,
903	906	.log2_chroma_h = 0,
904	907	.comp = {
905		− { 0, 1, 0, 3, 4 }, /* R */
906		− { 0, 1, 1, 5, 5 }, /* G */
907		− { 0, 1, 1, 0, 4 }, /* B */
	908	+ { 0, 2, -1, 3, 5, 1, 4, 0 }, /* R */
	909	+ { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
	910	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
908	911	},
909	912	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
910	913	},
@@ -914,9 +917,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
914	917	.log2_chroma_w = 0,
915	918	.log2_chroma_h = 0,
916	919	.comp = {
917		− { 0, 1, 2, 3, 4 }, /* R */
918		− { 0, 1, 1, 5, 5 }, /* G */
919		− { 0, 1, 1, 0, 4 }, /* B */
	920	+ { 0, 2, 1, 3, 5, 1, 4, 2 }, /* R */
	921	+ { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
	922	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
920	923	},
921	924	.flags = AV_PIX_FMT_FLAG_RGB,
922	925	},
@@ -926,9 +929,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
926	929	.log2_chroma_w = 0,
927	930	.log2_chroma_h = 0,
928	931	.comp = {
929		− { 0, 1, 0, 2, 4 }, /* R */
930		− { 0, 1, 1, 5, 4 }, /* G */
931		− { 0, 1, 1, 0, 4 }, /* B */
	932	+ { 0, 2, -1, 2, 5, 1, 4, 0 }, /* R */
	933	+ { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
	934	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
932	935	},
933	936	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
934	937	},
@@ -938,9 +941,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
938	941	.log2_chroma_w = 0,
939	942	.log2_chroma_h = 0,
940	943	.comp = {
941		− { 0, 1, 2, 2, 4 }, /* R */
942		− { 0, 1, 1, 5, 4 }, /* G */
943		− { 0, 1, 1, 0, 4 }, /* B */
	944	+ { 0, 2, 1, 2, 5, 1, 4, 2 }, /* R */
	945	+ { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
	946	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
944	947	},
945	948	.flags = AV_PIX_FMT_FLAG_RGB,
946	949	},
@@ -950,9 +953,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
950	953	.log2_chroma_w = 0,
951	954	.log2_chroma_h = 0,
952	955	.comp = {
953		− { 0, 1, 0, 0, 3 }, /* R */
954		− { 0, 1, 1, 4, 3 }, /* G */
955		− { 0, 1, 1, 0, 3 }, /* B */
	956	+ { 0, 2, -1, 0, 4, 1, 3, 0 }, /* R */
	957	+ { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
	958	+ { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */
956	959	},
957	960	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
958	961	},
@@ -962,9 +965,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
962	965	.log2_chroma_w = 0,
963	966	.log2_chroma_h = 0,
964	967	.comp = {
965		− { 0, 1, 2, 0, 3 }, /* R */
966		− { 0, 1, 1, 4, 3 }, /* G */
967		− { 0, 1, 1, 0, 3 }, /* B */
	968	+ { 0, 2, 1, 0, 4, 1, 3, 2 }, /* R */
	969	+ { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
	970	+ { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */
968	971	},
969	972	.flags = AV_PIX_FMT_FLAG_RGB,
970	973	},
@@ -974,9 +977,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
974	977	.log2_chroma_w = 0,
975	978	.log2_chroma_h = 0,
976	979	.comp = {
977		− { 0, 5, 1, 0, 15 }, /* B */
978		− { 0, 5, 3, 0, 15 }, /* G */
979		− { 0, 5, 5, 0, 15 }, /* R */
	980	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
	981	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	982	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
980	983	},
981	984	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
982	985	},
@@ -986,9 +989,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
986	989	.log2_chroma_w = 0,
987	990	.log2_chroma_h = 0,
988	991	.comp = {
989		− { 0, 5, 1, 0, 15 }, /* B */
990		− { 0, 5, 3, 0, 15 }, /* G */
991		− { 0, 5, 5, 0, 15 }, /* R */
	992	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
	993	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	994	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
992	995	},
993	996	.flags = AV_PIX_FMT_FLAG_RGB,
994	997	},
@@ -998,10 +1001,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
998	1001	.log2_chroma_w = 0,
999	1002	.log2_chroma_h = 0,
1000	1003	.comp = {
1001		− { 0, 5, 1, 0, 15 }, /* B */
1002		− { 0, 5, 3, 0, 15 }, /* G */
1003		− { 0, 5, 5, 0, 15 }, /* R */
1004		− { 0, 5, 7, 0, 15 }, /* A */
	1004	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
	1005	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	1006	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
	1007	+ { 0, 6, 6, 0, 16, 5, 15, 7 }, /* A */
1005	1008	},
1006	1009	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
1007	1010	},
@@ -1011,10 +1014,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1011	1014	.log2_chroma_w = 0,
1012	1015	.log2_chroma_h = 0,
1013	1016	.comp = {
1014		− { 0, 5, 1, 0, 15 }, /* B */
1015		− { 0, 5, 3, 0, 15 }, /* G */
1016		− { 0, 5, 5, 0, 15 }, /* R */
1017		− { 0, 5, 7, 0, 15 }, /* A */
	1017	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
	1018	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	1019	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
	1020	+ { 0, 6, 6, 0, 16, 5, 15, 7 }, /* A */
1018	1021	},
1019	1022	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
1020	1023	},
@@ -1024,9 +1027,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1024	1027	.log2_chroma_w = 0,
1025	1028	.log2_chroma_h = 0,
1026	1029	.comp = {
1027		− { 0, 1, 0, 3, 4 }, /* B */
1028		− { 0, 1, 1, 5, 5 }, /* G */
1029		− { 0, 1, 1, 0, 4 }, /* R */
	1030	+ { 0, 2, -1, 3, 5, 1, 4, 0 }, /* B */
	1031	+ { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
	1032	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
1030	1033	},
1031	1034	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1032	1035	},
@@ -1036,9 +1039,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1036	1039	.log2_chroma_w = 0,
1037	1040	.log2_chroma_h = 0,
1038	1041	.comp = {
1039		− { 0, 1, 2, 3, 4 }, /* B */
1040		− { 0, 1, 1, 5, 5 }, /* G */
1041		− { 0, 1, 1, 0, 4 }, /* R */
	1042	+ { 0, 2, 1, 3, 5, 1, 4, 2 }, /* B */
	1043	+ { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
	1044	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
1042	1045	},
1043	1046	.flags = AV_PIX_FMT_FLAG_RGB,
1044	1047	},
@@ -1048,9 +1051,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1048	1051	.log2_chroma_w = 0,
1049	1052	.log2_chroma_h = 0,
1050	1053	.comp = {
1051		− { 0, 1, 0, 2, 4 }, /* B */
1052		− { 0, 1, 1, 5, 4 }, /* G */
1053		− { 0, 1, 1, 0, 4 }, /* R */
	1054	+ { 0, 2, -1, 2, 5, 1, 4, 0 }, /* B */
	1055	+ { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
	1056	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
1054	1057	},
1055	1058	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1056	1059	},
@@ -1060,9 +1063,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1060	1063	.log2_chroma_w = 0,
1061	1064	.log2_chroma_h = 0,
1062	1065	.comp = {
1063		− { 0, 1, 2, 2, 4 }, /* B */
1064		− { 0, 1, 1, 5, 4 }, /* G */
1065		− { 0, 1, 1, 0, 4 }, /* R */
	1066	+ { 0, 2, 1, 2, 5, 1, 4, 2 }, /* B */
	1067	+ { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
	1068	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
1066	1069	},
1067	1070	.flags = AV_PIX_FMT_FLAG_RGB,
1068	1071	},
@@ -1072,9 +1075,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1072	1075	.log2_chroma_w = 0,
1073	1076	.log2_chroma_h = 0,
1074	1077	.comp = {
1075		− { 0, 1, 0, 0, 3 }, /* B */
1076		− { 0, 1, 1, 4, 3 }, /* G */
1077		− { 0, 1, 1, 0, 3 }, /* R */
	1078	+ { 0, 2, -1, 0, 4, 1, 3, 0 }, /* B */
	1079	+ { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
	1080	+ { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */
1078	1081	},
1079	1082	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1080	1083	},
@@ -1084,9 +1087,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1084	1087	.log2_chroma_w = 0,
1085	1088	.log2_chroma_h = 0,
1086	1089	.comp = {
1087		− { 0, 1, 2, 0, 3 }, /* B */
1088		− { 0, 1, 1, 4, 3 }, /* G */
1089		− { 0, 1, 1, 0, 3 }, /* R */
	1090	+ { 0, 2, 1, 0, 4, 1, 3, 2 }, /* B */
	1091	+ { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
	1092	+ { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */
1090	1093	},
1091	1094	.flags = AV_PIX_FMT_FLAG_RGB,
1092	1095	},
@@ -1120,9 +1123,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 27 unmodified lines
1120	1123	.log2_chroma_w = 1,
1121	1124	.log2_chroma_h = 1,
1122	1125	.comp = {
1123		− { 0, 1, 1, 0, 8 }, /* Y */
1124		− { 1, 1, 1, 0, 8 }, /* U */
1125		− { 2, 1, 1, 0, 8 }, /* V */
	1126	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1127	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1128	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1126	1129	},
1127	1130	.flags = AV_PIX_FMT_FLAG_PLANAR,
1128	1131	},
@@ -1132,9 +1135,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1132	1135	.log2_chroma_w = 1,
1133	1136	.log2_chroma_h = 1,
1134	1137	.comp = {
1135		− { 0, 1, 1, 0, 8 }, /* Y */
1136		− { 1, 1, 1, 0, 8 }, /* U */
1137		− { 2, 1, 1, 0, 8 }, /* V */
	1138	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1139	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1140	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1138	1141	},
1139	1142	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1140	1143	},
@@ -1144,9 +1147,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1144	1147	.log2_chroma_w = 1,
1145	1148	.log2_chroma_h = 1,
1146	1149	.comp = {
1147		− { 0, 1, 1, 0, 9 }, /* Y */
1148		− { 1, 1, 1, 0, 9 }, /* U */
1149		− { 2, 1, 1, 0, 9 }, /* V */
	1150	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1151	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1152	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1150	1153	},
1151	1154	.flags = AV_PIX_FMT_FLAG_PLANAR,
1152	1155	},
@@ -1156,9 +1159,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1156	1159	.log2_chroma_w = 1,
1157	1160	.log2_chroma_h = 1,
1158	1161	.comp = {
1159		− { 0, 1, 1, 0, 9 }, /* Y */
1160		− { 1, 1, 1, 0, 9 }, /* U */
1161		− { 2, 1, 1, 0, 9 }, /* V */
	1162	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1163	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1164	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1162	1165	},
1163	1166	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1164	1167	},
@@ -1168,9 +1171,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1168	1171	.log2_chroma_w = 1,
1169	1172	.log2_chroma_h = 1,
1170	1173	.comp = {
1171		− { 0, 1, 1, 0, 15 }, /* Y */
1172		− { 1, 1, 1, 0, 15 }, /* U */
1173		− { 2, 1, 1, 0, 15 }, /* V */
	1174	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1175	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1176	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1174	1177	},
1175	1178	.flags = AV_PIX_FMT_FLAG_PLANAR,
1176	1179	},
@@ -1180,9 +1183,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1180	1183	.log2_chroma_w = 1,
1181	1184	.log2_chroma_h = 1,
1182	1185	.comp = {
1183		− { 0, 1, 1, 0, 15 }, /* Y */
1184		− { 1, 1, 1, 0, 15 }, /* U */
1185		− { 2, 1, 1, 0, 15 }, /* V */
	1186	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1187	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1188	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1186	1189	},
1187	1190	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1188	1191	},
@@ -1192,9 +1195,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1192	1195	.log2_chroma_w = 1,
1193	1196	.log2_chroma_h = 0,
1194	1197	.comp = {
1195		− { 0, 1, 1, 0, 8 }, /* Y */
1196		− { 1, 1, 1, 0, 8 }, /* U */
1197		− { 2, 1, 1, 0, 8 }, /* V */
	1198	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1199	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1200	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1198	1201	},
1199	1202	.flags = AV_PIX_FMT_FLAG_PLANAR,
1200	1203	},
@@ -1204,9 +1207,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1204	1207	.log2_chroma_w = 1,
1205	1208	.log2_chroma_h = 0,
1206	1209	.comp = {
1207		− { 0, 1, 1, 0, 8 }, /* Y */
1208		− { 1, 1, 1, 0, 8 }, /* U */
1209		− { 2, 1, 1, 0, 8 }, /* V */
	1210	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1211	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1212	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1210	1213	},
1211	1214	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1212	1215	},
@@ -1216,9 +1219,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1216	1219	.log2_chroma_w = 1,
1217	1220	.log2_chroma_h = 0,
1218	1221	.comp = {
1219		− { 0, 1, 1, 0, 9 }, /* Y */
1220		− { 1, 1, 1, 0, 9 }, /* U */
1221		− { 2, 1, 1, 0, 9 }, /* V */
	1222	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1223	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1224	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1222	1225	},
1223	1226	.flags = AV_PIX_FMT_FLAG_PLANAR,
1224	1227	},
@@ -1228,9 +1231,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1228	1231	.log2_chroma_w = 1,
1229	1232	.log2_chroma_h = 0,
1230	1233	.comp = {
1231		− { 0, 1, 1, 0, 9 }, /* Y */
1232		− { 1, 1, 1, 0, 9 }, /* U */
1233		− { 2, 1, 1, 0, 9 }, /* V */
	1234	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1235	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1236	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1234	1237	},
1235	1238	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1236	1239	},
@@ -1240,9 +1243,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1240	1243	.log2_chroma_w = 1,
1241	1244	.log2_chroma_h = 0,
1242	1245	.comp = {
1243		− { 0, 1, 1, 0, 15 }, /* Y */
1244		− { 1, 1, 1, 0, 15 }, /* U */
1245		− { 2, 1, 1, 0, 15 }, /* V */
	1246	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1247	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1248	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1246	1249	},
1247	1250	.flags = AV_PIX_FMT_FLAG_PLANAR,
1248	1251	},
@@ -1252,9 +1255,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1252	1255	.log2_chroma_w = 1,
1253	1256	.log2_chroma_h = 0,
1254	1257	.comp = {
1255		− { 0, 1, 1, 0, 15 }, /* Y */
1256		− { 1, 1, 1, 0, 15 }, /* U */
1257		− { 2, 1, 1, 0, 15 }, /* V */
	1258	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1259	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1260	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1258	1261	},
1259	1262	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1260	1263	},
@@ -1264,9 +1267,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1264	1267	.log2_chroma_w = 0,
1265	1268	.log2_chroma_h = 0,
1266	1269	.comp = {
1267		− { 0, 1, 1, 0, 15 }, /* Y */
1268		− { 1, 1, 1, 0, 15 }, /* U */
1269		− { 2, 1, 1, 0, 15 }, /* V */
	1270	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1271	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1272	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1270	1273	},
1271	1274	.flags = AV_PIX_FMT_FLAG_PLANAR,
1272	1275	},
@@ -1276,9 +1279,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1276	1279	.log2_chroma_w = 0,
1277	1280	.log2_chroma_h = 0,
1278	1281	.comp = {
1279		− { 0, 1, 1, 0, 15 }, /* Y */
1280		− { 1, 1, 1, 0, 15 }, /* U */
1281		− { 2, 1, 1, 0, 15 }, /* V */
	1282	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1283	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1284	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1282	1285	},
1283	1286	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1284	1287	},
@@ -1288,9 +1291,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1288	1291	.log2_chroma_w = 0,
1289	1292	.log2_chroma_h = 0,
1290	1293	.comp = {
1291		− { 0, 1, 1, 0, 9 }, /* Y */
1292		− { 1, 1, 1, 0, 9 }, /* U */
1293		− { 2, 1, 1, 0, 9 }, /* V */
	1294	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1295	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1296	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1294	1297	},
1295	1298	.flags = AV_PIX_FMT_FLAG_PLANAR,
1296	1299	},
@@ -1300,9 +1303,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1300	1303	.log2_chroma_w = 0,
1301	1304	.log2_chroma_h = 0,
1302	1305	.comp = {
1303		− { 0, 1, 1, 0, 9 }, /* Y */
1304		− { 1, 1, 1, 0, 9 }, /* U */
1305		− { 2, 1, 1, 0, 9 }, /* V */
	1306	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1307	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1308	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1306	1309	},
1307	1310	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1308	1311	},
@@ -1312,9 +1315,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1312	1315	.log2_chroma_w = 0,
1313	1316	.log2_chroma_h = 0,
1314	1317	.comp = {
1315		− { 0, 1, 1, 0, 8 }, /* Y */
1316		− { 1, 1, 1, 0, 8 }, /* U */
1317		− { 2, 1, 1, 0, 8 }, /* V */
	1318	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1319	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1320	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1318	1321	},
1319	1322	.flags = AV_PIX_FMT_FLAG_PLANAR,
1320	1323	},
@@ -1324,9 +1327,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1324	1327	.log2_chroma_w = 0,
1325	1328	.log2_chroma_h = 0,
1326	1329	.comp = {
1327		− { 0, 1, 1, 0, 8 }, /* Y */
1328		− { 1, 1, 1, 0, 8 }, /* U */
1329		− { 2, 1, 1, 0, 8 }, /* V */
	1330	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1331	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1332	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1330	1333	},
1331	1334	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1332	1335	},
@@ -1346,8 +1349,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 13 unmodified lines
1346	1349	.name = "ya8",
1347	1350	.nb_components = 2,
1348	1351	.comp = {
1349		− { 0, 1, 1, 0, 7 }, /* Y */
1350		− { 0, 1, 2, 0, 7 }, /* A */
	1352	+ { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
	1353	+ { 0, 2, 1, 0, 8, 1, 7, 2 }, /* A */
1351	1354	},
1352	1355	.flags = AV_PIX_FMT_FLAG_ALPHA,
1353	1356	.alias = "gray8a",
@@ -1356,8 +1359,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
1356	1359	.name = "ya16le",
1357	1360	.nb_components = 2,
1358	1361	.comp = {
1359		− { 0, 3, 1, 0, 15 }, /* Y */
1360		− { 0, 3, 3, 0, 15 }, /* A */
	1362	+ { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */
	1363	+ { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */
1361	1364	},
1362	1365	.flags = AV_PIX_FMT_FLAG_ALPHA,
1363	1366	},
@@ -1365,8 +1368,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1 unmodified line
1365	1368	.name = "ya16be",
1366	1369	.nb_components = 2,
1367	1370	.comp = {
1368		− { 0, 3, 1, 0, 15 }, /* Y */
1369		− { 0, 3, 3, 0, 15 }, /* A */
	1371	+ { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */
	1372	+ { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */
1370	1373	},
1371	1374	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_ALPHA,
1372	1375	},
@@ -1376,9 +1379,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1376	1379	.log2_chroma_w = 0,
1377	1380	.log2_chroma_h = 0,
1378	1381	.comp = {
1379		− { 0, 0, 1, 0, 7 }, /* G */
1380		− { 1, 0, 1, 0, 7 }, /* B */
1381		− { 2, 0, 1, 0, 7 }, /* R */
	1382	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */
	1383	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */
	1384	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */
1382	1385	},
1383	1386	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1384	1387	},
@@ -1388,9 +1391,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1388	1391	.log2_chroma_w = 0,
1389	1392	.log2_chroma_h = 0,
1390	1393	.comp = {
1391		− { 0, 1, 1, 0, 8 }, /* G */
1392		− { 1, 1, 1, 0, 8 }, /* B */
1393		− { 2, 1, 1, 0, 8 }, /* R */
	1394	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */
	1395	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */
	1396	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */
1394	1397	},
1395	1398	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1396	1399	},
@@ -1400,9 +1403,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1400	1403	.log2_chroma_w = 0,
1401	1404	.log2_chroma_h = 0,
1402	1405	.comp = {
1403		− { 0, 1, 1, 0, 8 }, /* G */
1404		− { 1, 1, 1, 0, 8 }, /* B */
1405		− { 2, 1, 1, 0, 8 }, /* R */
	1406	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */
	1407	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */
	1408	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */
1406	1409	},
1407	1410	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1408	1411	},
@@ -1412,9 +1415,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1412	1415	.log2_chroma_w = 0,
1413	1416	.log2_chroma_h = 0,
1414	1417	.comp = {
1415		− { 0, 1, 1, 0, 9 }, /* G */
1416		− { 1, 1, 1, 0, 9 }, /* B */
1417		− { 2, 1, 1, 0, 9 }, /* R */
	1418	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
	1419	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
	1420	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
1418	1421	},
1419	1422	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1420	1423	},
@@ -1424,9 +1427,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1424	1427	.log2_chroma_w = 0,
1425	1428	.log2_chroma_h = 0,
1426	1429	.comp = {
1427		− { 0, 1, 1, 0, 9 }, /* G */
1428		− { 1, 1, 1, 0, 9 }, /* B */
1429		− { 2, 1, 1, 0, 9 }, /* R */
	1430	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
	1431	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
	1432	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
1430	1433	},
1431	1434	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1432	1435	},
@@ -1436,9 +1439,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1436	1439	.log2_chroma_w = 0,
1437	1440	.log2_chroma_h = 0,
1438	1441	.comp = {
1439		− { 0, 1, 1, 0, 15 }, /* G */
1440		− { 1, 1, 1, 0, 15 }, /* B */
1441		− { 2, 1, 1, 0, 15 }, /* R */
	1442	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
	1443	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
	1444	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
1442	1445	},
1443	1446	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1444	1447	},
@@ -1448,9 +1451,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1448	1451	.log2_chroma_w = 0,
1449	1452	.log2_chroma_h = 0,
1450	1453	.comp = {
1451		− { 0, 1, 1, 0, 15 }, /* G */
1452		− { 1, 1, 1, 0, 15 }, /* B */
1453		− { 2, 1, 1, 0, 15 }, /* R */
	1454	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
	1455	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
	1456	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
1454	1457	},
1455	1458	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1456	1459	},
@@ -1460,10 +1463,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1460	1463	.log2_chroma_w = 0,
1461	1464	.log2_chroma_h = 0,
1462	1465	.comp = {
1463		− { 0, 0, 1, 0, 7 }, /* G */
1464		− { 1, 0, 1, 0, 7 }, /* B */
1465		− { 2, 0, 1, 0, 7 }, /* R */
1466		− { 3, 0, 1, 0, 7 }, /* A */
	1466	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */
	1467	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */
	1468	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */
	1469	+ { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
1467	1470	},
1468	1471	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB \|
1469	1472	AV_PIX_FMT_FLAG_ALPHA,
@@ -1474,10 +1477,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
1474	1477	.log2_chroma_w = 0,
1475	1478	.log2_chroma_h = 0,
1476	1479	.comp = {
1477		− { 0, 1, 1, 0, 15 }, /* G */
1478		− { 1, 1, 1, 0, 15 }, /* B */
1479		− { 2, 1, 1, 0, 15 }, /* R */
1480		− { 3, 1, 1, 0, 15 }, /* A */
	1480	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
	1481	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
	1482	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
	1483	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
1481	1484	},
1482	1485	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB \|
1483	1486	AV_PIX_FMT_FLAG_ALPHA,
@@ -1488,10 +1491,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
1488	1491	.log2_chroma_w = 0,
1489	1492	.log2_chroma_h = 0,
1490	1493	.comp = {
1491		− { 0, 1, 1, 0, 15 }, /* G */
1492		− { 1, 1, 1, 0, 15 }, /* B */
1493		− { 2, 1, 1, 0, 15 }, /* R */
1494		− { 3, 1, 1, 0, 15 }, /* A */
	1494	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
	1495	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
	1496	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
	1497	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
1495	1498	},
1496	1499	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \|
1497	1500	AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
@@ -1508,9 +1511,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 10 unmodified lines
1508	1511	.log2_chroma_w = 0,
1509	1512	.log2_chroma_h = 0,
1510	1513	.comp = {
1511		− { 0, 5, 1, 4, 11 }, /* X */
1512		− { 0, 5, 3, 4, 11 }, /* Y */
1513		− { 0, 5, 5, 4, 11 }, /* Z */
	1514	+ { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */
	1515	+ { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */
	1516	+ { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */
1514	1517	},
1515	1518	/.flags = -- not used/
1516	1519	},
@@ -1520,9 +1523,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1520	1523	.log2_chroma_w = 0,
1521	1524	.log2_chroma_h = 0,
1522	1525	.comp = {
1523		− { 0, 5, 1, 4, 11 }, /* X */
1524		− { 0, 5, 3, 4, 11 }, /* Y */
1525		− { 0, 5, 5, 4, 11 }, /* Z */
	1526	+ { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */
	1527	+ { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */
	1528	+ { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */
1526	1529	},
1527	1530	.flags = AV_PIX_FMT_FLAG_BE,
1528	1531	},
@@ -1532,9 +1535,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1532	1535	.log2_chroma_w = 1,
1533	1536	.log2_chroma_h = 0,
1534	1537	.comp = {
1535		− { 0, 0, 1, 0, 7 }, /* Y */
1536		− { 1, 1, 1, 0, 7 }, /* U */
1537		− { 1, 1, 2, 0, 7 }, /* V */
	1538	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	1539	+ { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */
	1540	+ { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */
1538	1541	},
1539	1542	.flags = AV_PIX_FMT_FLAG_PLANAR,
1540	1543	},
@@ -1544,9 +1547,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1544	1547	.log2_chroma_w = 1,
1545	1548	.log2_chroma_h = 0,
1546	1549	.comp = {
1547		− { 0, 1, 1, 0, 9 }, /* Y */
1548		− { 1, 3, 1, 0, 9 }, /* U */
1549		− { 1, 3, 3, 0, 9 }, /* V */
	1550	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1551	+ { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */
	1552	+ { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */
1550	1553	},
1551	1554	.flags = AV_PIX_FMT_FLAG_PLANAR,
1552	1555	},
@@ -1556,9 +1559,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1556	1559	.log2_chroma_w = 1,
1557	1560	.log2_chroma_h = 0,
1558	1561	.comp = {
1559		− { 0, 1, 1, 0, 9 }, /* Y */
1560		− { 1, 3, 1, 0, 9 }, /* U */
1561		− { 1, 3, 3, 0, 9 }, /* V */
	1562	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1563	+ { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */
	1564	+ { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */
1562	1565	},
1563	1566	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_BE,
1564	1567	},
@@ -1575,6 +1578,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 10 unmodified lines
1575	1578	.flags = AV_PIX_FMT_FLAG_HWACCEL,
1576	1579	},
1577	1580	};
	1581	+#if FF_API_PLUS1_MINUS1
	1582	+FF_ENABLE_DEPRECATION_WARNINGS
	1583	+#endif
1578	1584
1579	1585	static const char *color_range_names[AVCOL_RANGE_NB] = {
1580	1586	"unknown", "tv", "pc",
@@ -1655,7 +1661,7 @@ int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc) · 74 unmodified lines
1655	1661
1656	1662	for (c = 0; c < pixdesc->nb_components; c++) {
1657	1663	int s = c == 1 \|\| c == 2 ? 0 : log2_pixels;
1658		− bits += (pixdesc->comp[c].depth_minus1 + 1) << s;
	1664	+ bits += pixdesc->comp[c].depth << s;
1659	1665	}
1660	1666
1661	1667	return bits >> log2_pixels;

libavutil/pixdesc.h+17−6

@@ -34,16 +34,16 @@ typedef struct AVComponentDescriptor { · 33 unmodified lines
34	34	int plane;
35	35
36	36	/**
37		− * Number of elements between 2 horizontally consecutive pixels minus 1.
	37	+ * Number of elements between 2 horizontally consecutive pixels.
38	38	* Elements are bits for bitstream formats, bytes otherwise.
39	39	*/
40		− int step_minus1;
	40	+ int step;
41	41
42	42	/**
43		− * Number of elements before the component of the first pixel plus 1.
	43	+ * Number of elements before the component of the first pixel.
44	44	* Elements are bits for bitstream formats, bytes otherwise.
45	45	*/
46		− int offset_plus1;
	46	+ int offset;
47	47
48	48	/**
49	49	* Number of least significant bits that must be shifted away
@@ -52,9 +52,20 @@ typedef struct AVComponentDescriptor { · 2 unmodified lines
52	52	int shift;
53	53
54	54	/**
55		− * Number of bits in the component minus 1.
	55	+ * Number of bits in the component.
56	56	*/
57		− int depth_minus1;
	57	+ int depth;
	58	+
	59	+#if FF_API_PLUS1_MINUS1
	60	+ /** deprecated, use step instead */
	61	+ attribute_deprecated int step_minus1;
	62	+
	63	+ /** deprecated, use depth instead */
	64	+ attribute_deprecated int depth_minus1;
	65	+
	66	+ /** deprecated, use offset instead */
	67	+ attribute_deprecated int offset_plus1;
	68	+#endif
58	69	} AVComponentDescriptor;
59	70
60	71	/**

libavutil/version.h+3−0

@@ -93,6 +93,9 @@ · 92 unmodified lines
93	93	#ifndef FF_API_CRYPTO_CONTEXT
94	94	#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56)
95	95	#endif
	96	+#ifndef FF_API_PLUS1_MINUS1
	97	+#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56)
	98	+#endif
96	99
97	100
98	101	/**

libswscale/output.c+2−2

@@ -1279,7 +1279,7 @@ yuv2gbrp_full_X_c(SwsContext c, const int16_t lumFilter, · 1278 unmodified lines
1279	1279	int i;
1280	1280	int hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) && alpSrc;
1281	1281	uint16_t dest16 = (uint16_t)dest;
1282		− int SH = 22 + 7 - desc->comp[0].depth_minus1;
	1282	+ int SH = 22 + 8 - desc->comp[0].depth;
1283	1283
1284	1284	for (i = 0; i < dstW; i++) {
1285	1285	int j;
@@ -1366,7 +1366,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, · 80 unmodified lines
1366	1366	*yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c;
1367	1367	*yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c;
1368	1368	} else if (is9_OR_10BPS(dstFormat)) {
1369		− if (desc->comp[0].depth_minus1 == 8) {
	1369	+ if (desc->comp[0].depth == 9) {
1370	1370	*yuv2planeX = isBE(dstFormat) ? yuv2planeX_9BE_c : yuv2planeX_9LE_c;
1371	1371	*yuv2plane1 = isBE(dstFormat) ? yuv2plane1_9BE_c : yuv2plane1_9LE_c;
1372	1372	} else {

libswscale/swscale.c+3−4

@@ -91,7 +91,7 @@ static void hScale16To19_c(SwsContext c, int16_t _dst, int dstW, · 90 unmodified lines
91	91	int i;
92	92	int32_t dst = (int32_t ) _dst;
93	93	const uint16_t src = (const uint16_t ) _src;
94		− int bits = desc->comp[0].depth_minus1;
	94	+ int bits = desc->comp[0].depth - 1;
95	95	int sh = bits - 4;
96	96
97	97	for (i = 0; i < dstW; i++) {
@@ -114,7 +114,7 @@ static void hScale16To15_c(SwsContext c, int16_t dst, int dstW, · 16 unmodified lines
114	114	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat);
115	115	int i;
116	116	const uint16_t src = (const uint16_t ) _src;
117		− int sh = desc->comp[0].depth_minus1;
	117	+ int sh = desc->comp[0].depth - 1;
118	118
119	119	for (i = 0; i < dstW; i++) {
120	120	int j;
@@ -699,8 +699,7 @@ static int swscale(SwsContext c, const uint8_t src[], · 578 unmodified lines
699	699	if (is9_OR_10BPS(dstFormat)) {
700	700	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat);
701	701	fill_plane9or10(dst[3], dstStride[3], length, height, lastDstY,
702		− 255, desc->comp[3].depth_minus1 + 1,
703		− isBE(dstFormat));
	702	+ 255, desc->comp[3].depth, isBE(dstFormat));
704	703	} else
705	704	fillPlane(dst[3], dstStride[3], length, height, lastDstY, 255);
706	705	}

libswscale/swscale_internal.h+2−2

@@ -562,14 +562,14 @@ static av_always_inline int is16BPS(enum AVPixelFormat pix_fmt) · 561 unmodified lines
562	562	{
563	563	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
564	564	av_assert0(desc);
565		− return desc->comp[0].depth_minus1 == 15;
	565	+ return desc->comp[0].depth == 16;
566	566	}
567	567
568	568	static av_always_inline int is9_OR_10BPS(enum AVPixelFormat pix_fmt)
569	569	{
570	570	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
571	571	av_assert0(desc);
572		− return desc->comp[0].depth_minus1 == 8 \|\| desc->comp[0].depth_minus1 == 9;
	572	+ return desc->comp[0].depth == 9 \|\| desc->comp[0].depth == 10;
573	573	}
574	574
575	575	static av_always_inline int isBE(enum AVPixelFormat pix_fmt)

libswscale/swscale_unscaled.c+6−6

@@ -816,15 +816,15 @@ static int planarCopyWrapper(SwsContext c, const uint8_t src[], · 815 unmodified lines
816	816	if (is9_OR_10BPS(c->dstFormat)) {
817	817	fill_plane9or10(dst[plane], dstStride[plane],
818	818	length, height, y, val,
819		− desc_dst->comp[plane].depth_minus1 + 1,
	819	+ desc_dst->comp[plane].depth,
820	820	isBE(c->dstFormat));
821	821	} else
822	822	fillPlane(dst[plane], dstStride[plane], length, height, y,
823	823	val);
824	824	} else {
825	825	if (is9_OR_10BPS(c->srcFormat)) {
826		− const int src_depth = desc_src->comp[plane].depth_minus1 + 1;
827		− const int dst_depth = desc_dst->comp[plane].depth_minus1 + 1;
	826	+ const int src_depth = desc_src->comp[plane].depth;
	827	+ const int dst_depth = desc_dst->comp[plane].depth;
828	828	const uint16_t srcPtr2 = (const uint16_t ) srcPtr;
829	829
830	830	if (is16BPS(c->dstFormat)) {
@@ -915,7 +915,7 @@ static int planarCopyWrapper(SwsContext c, const uint8_t src[], · 84 unmodified lines
915	915	}
916	916	}
917	917	} else if (is9_OR_10BPS(c->dstFormat)) {
918		− const int dst_depth = desc_dst->comp[plane].depth_minus1 + 1;
	918	+ const int dst_depth = desc_dst->comp[plane].depth;
919	919	uint16_t dstPtr2 = (uint16_t ) dstPtr;
920	920
921	921	if (is16BPS(c->srcFormat)) {
@@ -1006,7 +1006,7 @@ static int planarCopyWrapper(SwsContext c, const uint8_t src[], · 84 unmodified lines
1006	1006	} else {
1007	1007	if (is16BPS(c->srcFormat) && is16BPS(c->dstFormat))
1008	1008	length *= 2;
1009		− else if (!desc_src->comp[0].depth_minus1)
	1009	+ else if (desc_src->comp[0].depth == 1)
1010	1010	length >>= 3; // monowhite/black
1011	1011	for (i = 0; i < height; i++) {
1012	1012	memcpy(dstPtr, srcPtr, length);
@@ -1087,7 +1087,7 @@ void ff_get_unscaled_swscale(SwsContext *c) · 74 unmodified lines
1087	1087	if (srcFormat == AV_PIX_FMT_GBRP && isPlanar(srcFormat) && isByteRGB(dstFormat))
1088	1088	c->swscale = planarRgbToRgbWrapper;
1089	1089
1090		− if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth_minus1 == 7 &&
	1090	+ if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth == 8 &&
1091	1091	isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP)
1092	1092	c->swscale = rgbToPlanarRgbWrapper;
1093	1093

libswscale/utils.c+2−2

@@ -1039,10 +1039,10 @@ av_cold int sws_init_context(SwsContext c, SwsFilter srcFilter, · 1038 unmodified lines
1039	1039	}
1040	1040	}
1041	1041
1042		− c->srcBpc = 1 + desc_src->comp[0].depth_minus1;
	1042	+ c->srcBpc = desc_src->comp[0].depth;
1043	1043	if (c->srcBpc < 8)
1044	1044	c->srcBpc = 8;
1045		− c->dstBpc = 1 + desc_dst->comp[0].depth_minus1;
	1045	+ c->dstBpc = desc_dst->comp[0].depth;
1046	1046	if (c->dstBpc < 8)
1047	1047	c->dstBpc = 8;
1048	1048	if (c->dstBpc == 16)

lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code