Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'

* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba': lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields

Hendrik Leppkes committed 11 years ago

Commit 151aa2e2 parents f53569a 2268db218 files · +510 −486Browse files

Unified · Split

18 files

doc/APIchanges +2 −0
libavcodec/hevc.c +1 −1
libavcodec/hevc_refs.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 +2 −2
libavutil/pixdesc.c +454 −448
libavutil/pixdesc.h +18 −6
libavutil/version.h +4 −0
libswscale/output.c +2 −2
libswscale/swscale.c +3 −3
libswscale/swscale_internal.h +3 −3
libswscale/swscale_unscaled.c +5 −5
libswscale/utils.c +2 −2

doc/APIchanges+2−0

@@ -19,6 +19,8 @@ API changes, most recent first: · 18 unmodified lines
19	19	xxxxxxx - Change type of AVPixFmtDescriptor.flags from uint8_t to uint64_t.
20	20	xxxxxxx - Change type of AVComponentDescriptor fields from uint16_t to int
21	21	and drop bit packing.
	22	+ xxxxxxx - Add step, offset, and depth to AVComponentDescriptor to replace
	23	+ the deprecated step_minus1, offset_plus1, and depth_minus1.
22	24
23	25	-------- 8< --------- FFmpeg 2.8 was cut here -------- 8< ---------
24	26

libavcodec/hevc.c+1−1

@@ -2821,7 +2821,7 @@ static int verify_md5(HEVCContext s, AVFrame frame) · 2820 unmodified lines
2821	2821	if (!desc)
2822	2822	return AVERROR(EINVAL);
2823	2823
2824		− pixel_shift = desc->comp[0].depth_minus1 > 7;
	2824	+ pixel_shift = desc->comp[0].depth > 8;
2825	2825
2826	2826	av_log(s->avctx, AV_LOG_DEBUG, "Verifying checksum for frame with POC %d: ",
2827	2827	s->poc);

libavcodec/hevc_refs.c+1−1

@@ -206,7 +206,7 @@ int ff_hevc_output_frame(HEVCContext s, AVFrame out, int flush) · 205 unmodified lines
206	206	AVFrame *dst = out;
207	207	AVFrame *src = frame->frame;
208	208	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(src->format);
209		− int pixel_shift = !!(desc->comp[0].depth_minus1 > 7);
	209	+ int pixel_shift = !!(desc->comp[0].depth > 8);
210	210
211	211	ret = av_frame_ref(out, src);
212	212	if (frame->flags & HEVC_FRAME_FLAG_BUMPING)

libavcodec/libopenjpegdec.c+5−5

@@ -114,22 +114,22 @@ static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum AVP · 113 unmodified lines
114	114	switch (desc->nb_components) {
115	115	case 4:
116	116	match = match &&
117		− desc->comp[3].depth_minus1 + 1 >= image->comps[3].prec &&
	117	+ desc->comp[3].depth >= image->comps[3].prec &&
118	118	1 == image->comps[3].dx &&
119	119	1 == image->comps[3].dy;
120	120	case 3:
121	121	match = match &&
122		− desc->comp[2].depth_minus1 + 1 >= image->comps[2].prec &&
	122	+ desc->comp[2].depth >= image->comps[2].prec &&
123	123	1 << desc->log2_chroma_w == image->comps[2].dx &&
124	124	1 << desc->log2_chroma_h == image->comps[2].dy;
125	125	case 2:
126	126	match = match &&
127		− desc->comp[1].depth_minus1 + 1 >= image->comps[1].prec &&
	127	+ desc->comp[1].depth >= image->comps[1].prec &&
128	128	1 << desc->log2_chroma_w == image->comps[1].dx &&
129	129	1 << desc->log2_chroma_h == image->comps[1].dy;
130	130	case 1:
131	131	match = match &&
132		− desc->comp[0].depth_minus1 + 1 >= image->comps[0].prec &&
	132	+ desc->comp[0].depth >= image->comps[0].prec &&
133	133	1 == image->comps[0].dx &&
134	134	1 == image->comps[0].dy;
135	135	default:
@@ -388,7 +388,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, · 252 unmodified lines
388	388	}
389	389
390	390	desc = av_pix_fmt_desc_get(avctx->pix_fmt);
391		− pixel_size = desc->comp[0].step_minus1 + 1;
	391	+ pixel_size = desc->comp[0].step;
392	392	ispacked = libopenjpeg_ispacked(avctx->pix_fmt);
393	393
394	394	switch (pixel_size) {

libavcodec/libopenjpegenc.c+2−2

@@ -189,8 +189,8 @@ static opj_image_t mj2_create_image(AVCodecContext avctx, opj_cparameters_t *p · 188 unmodified lines
189	189	}
190	190
191	191	for (i = 0; i < numcomps; i++) {
192		− cmptparm[i].prec = desc->comp[i].depth_minus1 + 1;
193		− cmptparm[i].bpp = desc->comp[i].depth_minus1 + 1;
	192	+ cmptparm[i].prec = desc->comp[i].depth;
	193	+ cmptparm[i].bpp = desc->comp[i].depth;
194	194	cmptparm[i].sgnd = 0;
195	195	cmptparm[i].dx = sub_dx[i];
196	196	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_array(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_start = (td->h * jobnr ) / nb_jobs;
192	192	int slice_end = (td->h * (jobnr+1)) / nb_jobs;
@@ -486,7 +486,7 @@ static int config_props(AVFilterLink *link) · 293 unmodified lines
486	486	}
487	487
488	488	s->csp = av_pix_fmt_desc_get(link->format);
489		− if (s->csp->comp[0].depth_minus1 / 8 == 1) {
	489	+ if (s->csp->comp[0].depth > 8) {
490	490	s->filter_line = filter_line_c_16bit;
491	491	s->filter_edges = filter_edges_16bit;
492	492	} else {

libavutil/imgutils.c+2−2

@@ -41,8 +41,8 @@ void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], · 40 unmodified lines
41	41
42	42	for (i = 0; i < 4; i++) {
43	43	const AVComponentDescriptor *comp = &(pixdesc->comp[i]);
44		− if ((comp->step_minus1+1) > max_pixsteps[comp->plane]) {
45		− max_pixsteps[comp->plane] = comp->step_minus1+1;
	44	+ if (comp->step > max_pixsteps[comp->plane]) {
	45	+ max_pixsteps[comp->plane] = comp->step;
46	46	if (max_pixstep_comps)
47	47	max_pixstep_comps[comp->plane] = i;
48	48	}

libavutil/pixdesc.c+454−448

@@ -39,14 +39,14 @@ void av_read_image_line(uint16_t *dst, · 38 unmodified lines
39	39	{
40	40	AVComponentDescriptor comp = desc->comp[c];
41	41	int plane = comp.plane;
42		− int depth = comp.depth_minus1 + 1;
	42	+ int depth = comp.depth;
43	43	int mask = (1 << depth) - 1;
44	44	int shift = comp.shift;
45		− int step = comp.step_minus1 + 1;
	45	+ int step = comp.step;
46	46	int flags = desc->flags;
47	47
48	48	if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
49		− int skip = x * step + comp.offset_plus1 - 1;
	49	+ int skip = x * step + comp.offset;
50	50	const uint8_t p = data[plane] + y linesize[plane] + (skip >> 3);
51	51	int shift = 8 - depth - (skip & 7);
52	52
@@ -61,7 +61,7 @@ void av_read_image_line(uint16_t *dst, · 8 unmodified lines
61	61	}
62	62	} else {
63	63	const uint8_t p = data[plane] + y linesize[plane] +
64		− x * step + comp.offset_plus1 - 1;
	64	+ x * step + comp.offset;
65	65	int is_8bit = shift + depth <= 8;
66	66
67	67	if (is_8bit)
@@ -86,12 +86,12 @@ void av_write_image_line(const uint16_t *src, · 18 unmodified lines
86	86	{
87	87	AVComponentDescriptor comp = desc->comp[c];
88	88	int plane = comp.plane;
89		− int depth = comp.depth_minus1 + 1;
90		− int step = comp.step_minus1 + 1;
	89	+ int depth = comp.depth;
	90	+ int step = comp.step;
91	91	int flags = desc->flags;
92	92
93	93	if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
94		− int skip = x * step + comp.offset_plus1 - 1;
	94	+ int skip = x * step + comp.offset;
95	95	uint8_t p = data[plane] + y linesize[plane] + (skip >> 3);
96	96	int shift = 8 - depth - (skip & 7);
97	97
@@ -104,7 +104,7 @@ void av_write_image_line(const uint16_t *src, · 6 unmodified lines
104	104	} else {
105	105	int shift = comp.shift;
106	106	uint8_t p = data[plane] + y linesize[plane] +
107		− x * step + comp.offset_plus1 - 1;
	107	+ x * step + comp.offset;
108	108
109	109	if (shift + depth <= 8) {
110	110	p += !!(flags & AV_PIX_FMT_FLAG_BE);
@@ -127,6 +127,9 @@ void av_write_image_line(const uint16_t *src, · 16 unmodified lines
127	127	}
128	128	}
129	129
	130	+#if FF_API_PLUS1_MINUS1
	131	+FF_DISABLE_DEPRECATION_WARNINGS
	132	+#endif
130	133	static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
131	134	[AV_PIX_FMT_YUV420P] = {
132	135	.name = "yuv420p",
@@ -134,9 +137,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1 unmodified line
134	137	.log2_chroma_w = 1,
135	138	.log2_chroma_h = 1,
136	139	.comp = {
137		− { 0, 0, 1, 0, 7 }, /* Y */
138		− { 1, 0, 1, 0, 7 }, /* U */
139		− { 2, 0, 1, 0, 7 }, /* V */
	140	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	141	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	142	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
140	143	},
141	144	.flags = AV_PIX_FMT_FLAG_PLANAR,
142	145	},
@@ -146,9 +149,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
146	149	.log2_chroma_w = 1,
147	150	.log2_chroma_h = 0,
148	151	.comp = {
149		− { 0, 1, 1, 0, 7 }, /* Y */
150		− { 0, 3, 2, 0, 7 }, /* U */
151		− { 0, 3, 4, 0, 7 }, /* V */
	152	+ { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
	153	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* U */
	154	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* V */
152	155	},
153	156	},
154	157	[AV_PIX_FMT_YVYU422] = {
@@ -157,9 +160,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
157	160	.log2_chroma_w = 1,
158	161	.log2_chroma_h = 0,
159	162	.comp = {
160		− { 0, 1, 1, 0, 7 }, /* Y */
161		− { 0, 3, 2, 0, 7 }, /* V */
162		− { 0, 3, 4, 0, 7 }, /* U */
	163	+ { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
	164	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* V */
	165	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* U */
163	166	},
164	167	},
165	168	[AV_PIX_FMT_RGB24] = {
@@ -168,9 +171,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
168	171	.log2_chroma_w = 0,
169	172	.log2_chroma_h = 0,
170	173	.comp = {
171		− { 0, 2, 1, 0, 7 }, /* R */
172		− { 0, 2, 2, 0, 7 }, /* G */
173		− { 0, 2, 3, 0, 7 }, /* B */
	174	+ { 0, 3, 0, 0, 8, 2, 7, 1 }, /* R */
	175	+ { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */
	176	+ { 0, 3, 2, 0, 8, 2, 7, 3 }, /* B */
174	177	},
175	178	.flags = AV_PIX_FMT_FLAG_RGB,
176	179	},
@@ -180,9 +183,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
180	183	.log2_chroma_w = 0,
181	184	.log2_chroma_h = 0,
182	185	.comp = {
183		− { 0, 2, 3, 0, 7 }, /* R */
184		− { 0, 2, 2, 0, 7 }, /* G */
185		− { 0, 2, 1, 0, 7 }, /* B */
	186	+ { 0, 3, 2, 0, 8, 2, 7, 3 }, /* R */
	187	+ { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */
	188	+ { 0, 3, 0, 0, 8, 2, 7, 1 }, /* B */
186	189	},
187	190	.flags = AV_PIX_FMT_FLAG_RGB,
188	191	},
@@ -192,9 +195,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
192	195	.log2_chroma_w = 1,
193	196	.log2_chroma_h = 0,
194	197	.comp = {
195		− { 0, 0, 1, 0, 7 }, /* Y */
196		− { 1, 0, 1, 0, 7 }, /* U */
197		− { 2, 0, 1, 0, 7 }, /* V */
	198	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	199	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	200	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
198	201	},
199	202	.flags = AV_PIX_FMT_FLAG_PLANAR,
200	203	},
@@ -204,9 +207,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
204	207	.log2_chroma_w = 0,
205	208	.log2_chroma_h = 0,
206	209	.comp = {
207		− { 0, 0, 1, 0, 7 }, /* Y */
208		− { 1, 0, 1, 0, 7 }, /* U */
209		− { 2, 0, 1, 0, 7 }, /* V */
	210	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	211	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	212	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
210	213	},
211	214	.flags = AV_PIX_FMT_FLAG_PLANAR,
212	215	},
@@ -216,9 +219,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
216	219	.log2_chroma_w = 2,
217	220	.log2_chroma_h = 2,
218	221	.comp = {
219		− { 0, 0, 1, 0, 7 }, /* Y */
220		− { 1, 0, 1, 0, 7 }, /* U */
221		− { 2, 0, 1, 0, 7 }, /* V */
	222	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	223	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	224	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
222	225	},
223	226	.flags = AV_PIX_FMT_FLAG_PLANAR,
224	227	},
@@ -228,9 +231,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
228	231	.log2_chroma_w = 2,
229	232	.log2_chroma_h = 0,
230	233	.comp = {
231		− { 0, 0, 1, 0, 7 }, /* Y */
232		− { 1, 0, 1, 0, 7 }, /* U */
233		− { 2, 0, 1, 0, 7 }, /* V */
	234	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	235	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	236	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
234	237	},
235	238	.flags = AV_PIX_FMT_FLAG_PLANAR,
236	239	},
@@ -240,9 +243,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
240	243	.log2_chroma_w = 2,
241	244	.log2_chroma_h = 0,
242	245	.comp = {
243		− { 0, 0, 1, 0, 7 }, /* Y */
244		− { 1, 0, 1, 0, 7 }, /* U */
245		− { 2, 0, 1, 0, 7 }, /* V */
	246	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	247	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	248	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
246	249	},
247	250	.flags = AV_PIX_FMT_FLAG_PLANAR,
248	251	},
@@ -252,7 +255,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
252	255	.log2_chroma_w = 0,
253	256	.log2_chroma_h = 0,
254	257	.comp = {
255		− { 0, 0, 1, 0, 7 }, /* Y */
	258	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
256	259	},
257	260	.flags = AV_PIX_FMT_FLAG_PSEUDOPAL,
258	261	.alias = "gray8,y8",
@@ -263,7 +266,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
263	266	.log2_chroma_w = 0,
264	267	.log2_chroma_h = 0,
265	268	.comp = {
266		− { 0, 0, 1, 0, 0 }, /* Y */
	269	+ { 0, 1, 0, 0, 1, 0, 0, 1 }, /* Y */
267	270	},
268	271	.flags = AV_PIX_FMT_FLAG_BITSTREAM,
269	272	},
@@ -273,7 +276,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
273	276	.log2_chroma_w = 0,
274	277	.log2_chroma_h = 0,
275	278	.comp = {
276		− { 0, 0, 1, 7, 0 }, /* Y */
	279	+ { 0, 1, 0, 7, 1, 0, 0, 1 }, /* Y */
277	280	},
278	281	.flags = AV_PIX_FMT_FLAG_BITSTREAM,
279	282	},
@@ -283,7 +286,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
283	286	.log2_chroma_w = 0,
284	287	.log2_chroma_h = 0,
285	288	.comp = {
286		− { 0, 0, 1, 0, 7 },
	289	+ { 0, 1, 0, 0, 8, 0, 7, 1 },
287	290	},
288	291	.flags = AV_PIX_FMT_FLAG_PAL,
289	292	},
@@ -293,9 +296,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
293	296	.log2_chroma_w = 1,
294	297	.log2_chroma_h = 1,
295	298	.comp = {
296		− { 0, 0, 1, 0, 7 }, /* Y */
297		− { 1, 0, 1, 0, 7 }, /* U */
298		− { 2, 0, 1, 0, 7 }, /* V */
	299	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	300	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	301	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
299	302	},
300	303	.flags = AV_PIX_FMT_FLAG_PLANAR,
301	304	},
@@ -305,9 +308,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
305	308	.log2_chroma_w = 1,
306	309	.log2_chroma_h = 0,
307	310	.comp = {
308		− { 0, 0, 1, 0, 7 }, /* Y */
309		− { 1, 0, 1, 0, 7 }, /* U */
310		− { 2, 0, 1, 0, 7 }, /* V */
	311	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	312	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	313	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
311	314	},
312	315	.flags = AV_PIX_FMT_FLAG_PLANAR,
313	316	},
@@ -317,9 +320,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
317	320	.log2_chroma_w = 0,
318	321	.log2_chroma_h = 0,
319	322	.comp = {
320		− { 0, 0, 1, 0, 7 }, /* Y */
321		− { 1, 0, 1, 0, 7 }, /* U */
322		− { 2, 0, 1, 0, 7 }, /* V */
	323	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	324	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	325	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
323	326	},
324	327	.flags = AV_PIX_FMT_FLAG_PLANAR,
325	328	},
@@ -345,9 +348,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 19 unmodified lines
345	348	.log2_chroma_w = 1,
346	349	.log2_chroma_h = 0,
347	350	.comp = {
348		− { 0, 1, 2, 0, 7 }, /* Y */
349		− { 0, 3, 1, 0, 7 }, /* U */
350		− { 0, 3, 3, 0, 7 }, /* V */
	351	+ { 0, 2, 1, 0, 8, 1, 7, 2 }, /* Y */
	352	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* U */
	353	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* V */
351	354	},
352	355	},
353	356	[AV_PIX_FMT_UYYVYY411] = {
@@ -356,9 +359,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
356	359	.log2_chroma_w = 2,
357	360	.log2_chroma_h = 0,
358	361	.comp = {
359		− { 0, 3, 2, 0, 7 }, /* Y */
360		− { 0, 5, 1, 0, 7 }, /* U */
361		− { 0, 5, 4, 0, 7 }, /* V */
	362	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* Y */
	363	+ { 0, 6, 0, 0, 8, 5, 7, 1 }, /* U */
	364	+ { 0, 6, 3, 0, 8, 5, 7, 4 }, /* V */
362	365	},
363	366	},
364	367	[AV_PIX_FMT_BGR8] = {
@@ -367,9 +370,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
367	370	.log2_chroma_w = 0,
368	371	.log2_chroma_h = 0,
369	372	.comp = {
370		− { 0, 0, 1, 0, 2 }, /* R */
371		− { 0, 0, 1, 3, 2 }, /* G */
372		− { 0, 0, 1, 6, 1 }, /* B */
	373	+ { 0, 1, 0, 0, 3, 0, 2, 1 }, /* R */
	374	+ { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */
	375	+ { 0, 1, 0, 6, 2, 0, 1, 1 }, /* B */
373	376	},
374	377	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
375	378	},
@@ -379,9 +382,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
379	382	.log2_chroma_w = 0,
380	383	.log2_chroma_h = 0,
381	384	.comp = {
382		− { 0, 3, 4, 0, 0 }, /* R */
383		− { 0, 3, 2, 0, 1 }, /* G */
384		− { 0, 3, 1, 0, 0 }, /* B */
	385	+ { 0, 4, 3, 0, 1, 3, 0, 4 }, /* R */
	386	+ { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */
	387	+ { 0, 4, 0, 0, 1, 3, 0, 1 }, /* B */
385	388	},
386	389	.flags = AV_PIX_FMT_FLAG_BITSTREAM \| AV_PIX_FMT_FLAG_RGB,
387	390	},
@@ -391,9 +394,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
391	394	.log2_chroma_w = 0,
392	395	.log2_chroma_h = 0,
393	396	.comp = {
394		− { 0, 0, 1, 0, 0 }, /* R */
395		− { 0, 0, 1, 1, 1 }, /* G */
396		− { 0, 0, 1, 3, 0 }, /* B */
	397	+ { 0, 1, 0, 0, 1, 0, 0, 1 }, /* R */
	398	+ { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */
	399	+ { 0, 1, 0, 3, 1, 0, 0, 1 }, /* B */
397	400	},
398	401	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
399	402	},
@@ -403,9 +406,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
403	406	.log2_chroma_w = 0,
404	407	.log2_chroma_h = 0,
405	408	.comp = {
406		− { 0, 0, 1, 6, 1 }, /* R */
407		− { 0, 0, 1, 3, 2 }, /* G */
408		− { 0, 0, 1, 0, 2 }, /* B */
	409	+ { 0, 1, 0, 6, 2, 0, 1, 1 }, /* R */
	410	+ { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */
	411	+ { 0, 1, 0, 0, 3, 0, 2, 1 }, /* B */
409	412	},
410	413	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
411	414	},
@@ -415,9 +418,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
415	418	.log2_chroma_w = 0,
416	419	.log2_chroma_h = 0,
417	420	.comp = {
418		− { 0, 3, 1, 0, 0 }, /* R */
419		− { 0, 3, 2, 0, 1 }, /* G */
420		− { 0, 3, 4, 0, 0 }, /* B */
	421	+ { 0, 4, 0, 0, 1, 3, 0, 1 }, /* R */
	422	+ { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */
	423	+ { 0, 4, 3, 0, 1, 3, 0, 4 }, /* B */
421	424	},
422	425	.flags = AV_PIX_FMT_FLAG_BITSTREAM \| AV_PIX_FMT_FLAG_RGB,
423	426	},
@@ -427,9 +430,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
427	430	.log2_chroma_w = 0,
428	431	.log2_chroma_h = 0,
429	432	.comp = {
430		− { 0, 0, 1, 3, 0 }, /* R */
431		− { 0, 0, 1, 1, 1 }, /* G */
432		− { 0, 0, 1, 0, 0 }, /* B */
	433	+ { 0, 1, 0, 3, 1, 0, 0, 1 }, /* R */
	434	+ { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */
	435	+ { 0, 1, 0, 0, 1, 0, 0, 1 }, /* B */
433	436	},
434	437	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_PSEUDOPAL,
435	438	},
@@ -439,9 +442,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
439	442	.log2_chroma_w = 1,
440	443	.log2_chroma_h = 1,
441	444	.comp = {
442		− { 0, 0, 1, 0, 7 }, /* Y */
443		− { 1, 1, 1, 0, 7 }, /* U */
444		− { 1, 1, 2, 0, 7 }, /* V */
	445	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	446	+ { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */
	447	+ { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */
445	448	},
446	449	.flags = AV_PIX_FMT_FLAG_PLANAR,
447	450	},
@@ -451,9 +454,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
451	454	.log2_chroma_w = 1,
452	455	.log2_chroma_h = 1,
453	456	.comp = {
454		− { 0, 0, 1, 0, 7 }, /* Y */
455		− { 1, 1, 2, 0, 7 }, /* U */
456		− { 1, 1, 1, 0, 7 }, /* V */
	457	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	458	+ { 1, 2, 1, 0, 8, 1, 7, 2 }, /* U */
	459	+ { 1, 2, 0, 0, 8, 1, 7, 1 }, /* V */
457	460	},
458	461	.flags = AV_PIX_FMT_FLAG_PLANAR,
459	462	},
@@ -463,10 +466,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
463	466	.log2_chroma_w = 0,
464	467	.log2_chroma_h = 0,
465	468	.comp = {
466		− { 0, 3, 2, 0, 7 }, /* R */
467		− { 0, 3, 3, 0, 7 }, /* G */
468		− { 0, 3, 4, 0, 7 }, /* B */
469		− { 0, 3, 1, 0, 7 }, /* A */
	469	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */
	470	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
	471	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */
	472	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */
470	473	},
471	474	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
472	475	},
@@ -476,10 +479,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
476	479	.log2_chroma_w = 0,
477	480	.log2_chroma_h = 0,
478	481	.comp = {
479		− { 0, 3, 1, 0, 7 }, /* R */
480		− { 0, 3, 2, 0, 7 }, /* G */
481		− { 0, 3, 3, 0, 7 }, /* B */
482		− { 0, 3, 4, 0, 7 }, /* A */
	482	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */
	483	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
	484	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */
	485	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */
483	486	},
484	487	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
485	488	},
@@ -489,10 +492,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
489	492	.log2_chroma_w = 0,
490	493	.log2_chroma_h = 0,
491	494	.comp = {
492		− { 0, 3, 4, 0, 7 }, /* R */
493		− { 0, 3, 3, 0, 7 }, /* G */
494		− { 0, 3, 2, 0, 7 }, /* B */
495		− { 0, 3, 1, 0, 7 }, /* A */
	495	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */
	496	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
	497	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */
	498	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */
496	499	},
497	500	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
498	501	},
@@ -502,10 +505,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
502	505	.log2_chroma_w = 0,
503	506	.log2_chroma_h = 0,
504	507	.comp = {
505		− { 0, 3, 3, 0, 7 }, /* R */
506		− { 0, 3, 2, 0, 7 }, /* G */
507		− { 0, 3, 1, 0, 7 }, /* B */
508		− { 0, 3, 4, 0, 7 }, /* A */
	508	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */
	509	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
	510	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */
	511	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */
509	512	},
510	513	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
511	514	},
@@ -515,9 +518,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
515	518	.log2_chroma_w= 0,
516	519	.log2_chroma_h= 0,
517	520	.comp = {
518		− { 0, 3, 2, 0, 7 }, /* R */
519		− { 0, 3, 3, 0, 7 }, /* G */
520		− { 0, 3, 4, 0, 7 }, /* B */
	521	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */
	522	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
	523	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */
521	524	},
522	525	.flags = AV_PIX_FMT_FLAG_RGB,
523	526	},
@@ -527,9 +530,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
527	530	.log2_chroma_w= 0,
528	531	.log2_chroma_h= 0,
529	532	.comp = {
530		− { 0, 3, 1, 0, 7 }, /* R */
531		− { 0, 3, 2, 0, 7 }, /* G */
532		− { 0, 3, 3, 0, 7 }, /* B */
	533	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */
	534	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
	535	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */
533	536	},
534	537	.flags = AV_PIX_FMT_FLAG_RGB,
535	538	},
@@ -539,9 +542,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
539	542	.log2_chroma_w= 0,
540	543	.log2_chroma_h= 0,
541	544	.comp = {
542		− { 0, 3, 4, 0, 7 }, /* R */
543		− { 0, 3, 3, 0, 7 }, /* G */
544		− { 0, 3, 2, 0, 7 }, /* B */
	545	+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */
	546	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
	547	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */
545	548	},
546	549	.flags = AV_PIX_FMT_FLAG_RGB,
547	550	},
@@ -551,9 +554,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
551	554	.log2_chroma_w= 0,
552	555	.log2_chroma_h= 0,
553	556	.comp = {
554		− { 0, 3, 3, 0, 7 }, /* R */
555		− { 0, 3, 2, 0, 7 }, /* G */
556		− { 0, 3, 1, 0, 7 }, /* B */
	557	+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */
	558	+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
	559	+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */
557	560	},
558	561	.flags = AV_PIX_FMT_FLAG_RGB,
559	562	},
@@ -563,7 +566,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
563	566	.log2_chroma_w = 0,
564	567	.log2_chroma_h = 0,
565	568	.comp = {
566		− { 0, 1, 1, 0, 15 }, /* Y */
	569	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
567	570	},
568	571	.flags = AV_PIX_FMT_FLAG_BE,
569	572	.alias = "y16be",
@@ -574,7 +577,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
574	577	.log2_chroma_w = 0,
575	578	.log2_chroma_h = 0,
576	579	.comp = {
577		− { 0, 1, 1, 0, 15 }, /* Y */
	580	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
578	581	},
579	582	.alias = "y16le",
580	583	},
@@ -584,9 +587,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
584	587	.log2_chroma_w = 0,
585	588	.log2_chroma_h = 1,
586	589	.comp = {
587		− { 0, 0, 1, 0, 7 }, /* Y */
588		− { 1, 0, 1, 0, 7 }, /* U */
589		− { 2, 0, 1, 0, 7 }, /* V */
	590	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	591	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	592	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
590	593	},
591	594	.flags = AV_PIX_FMT_FLAG_PLANAR,
592	595	},
@@ -596,9 +599,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
596	599	.log2_chroma_w = 0,
597	600	.log2_chroma_h = 1,
598	601	.comp = {
599		− { 0, 0, 1, 0, 7 }, /* Y */
600		− { 1, 0, 1, 0, 7 }, /* U */
601		− { 2, 0, 1, 0, 7 }, /* V */
	602	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	603	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	604	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
602	605	},
603	606	.flags = AV_PIX_FMT_FLAG_PLANAR,
604	607	},
@@ -608,9 +611,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
608	611	.log2_chroma_w = 0,
609	612	.log2_chroma_h = 1,
610	613	.comp = {
611		− { 0, 1, 1, 0, 9 }, /* Y */
612		− { 1, 1, 1, 0, 9 }, /* U */
613		− { 2, 1, 1, 0, 9 }, /* V */
	614	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	615	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	616	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
614	617	},
615	618	.flags = AV_PIX_FMT_FLAG_PLANAR,
616	619	},
@@ -620,9 +623,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
620	623	.log2_chroma_w = 0,
621	624	.log2_chroma_h = 1,
622	625	.comp = {
623		− { 0, 1, 1, 0, 9 }, /* Y */
624		− { 1, 1, 1, 0, 9 }, /* U */
625		− { 2, 1, 1, 0, 9 }, /* V */
	626	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	627	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	628	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
626	629	},
627	630	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
628	631	},
@@ -632,9 +635,9 @@ 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 = 1,
634	637	.comp = {
635		− { 0, 1, 1, 0, 11 }, /* Y */
636		− { 1, 1, 1, 0, 11 }, /* U */
637		− { 2, 1, 1, 0, 11 }, /* V */
	638	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
	639	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
	640	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
638	641	},
639	642	.flags = AV_PIX_FMT_FLAG_PLANAR,
640	643	},
@@ -644,9 +647,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
644	647	.log2_chroma_w = 0,
645	648	.log2_chroma_h = 1,
646	649	.comp = {
647		− { 0, 1, 1, 0, 11 }, /* Y */
648		− { 1, 1, 1, 0, 11 }, /* U */
649		− { 2, 1, 1, 0, 11 }, /* V */
	650	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
	651	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
	652	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
650	653	},
651	654	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
652	655	},
@@ -656,10 +659,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
656	659	.log2_chroma_w = 1,
657	660	.log2_chroma_h = 1,
658	661	.comp = {
659		− { 0, 0, 1, 0, 7 }, /* Y */
660		− { 1, 0, 1, 0, 7 }, /* U */
661		− { 2, 0, 1, 0, 7 }, /* V */
662		− { 3, 0, 1, 0, 7 }, /* A */
	662	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	663	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	664	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
	665	+ { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
663	666	},
664	667	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
665	668	},
@@ -669,10 +672,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
669	672	.log2_chroma_w = 1,
670	673	.log2_chroma_h = 0,
671	674	.comp = {
672		− { 0, 0, 1, 0, 7 }, /* Y */
673		− { 1, 0, 1, 0, 7 }, /* U */
674		− { 2, 0, 1, 0, 7 }, /* V */
675		− { 3, 0, 1, 0, 7 }, /* A */
	675	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	676	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	677	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
	678	+ { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
676	679	},
677	680	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
678	681	},
@@ -682,10 +685,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
682	685	.log2_chroma_w = 0,
683	686	.log2_chroma_h = 0,
684	687	.comp = {
685		− { 0, 0, 1, 0, 7 }, /* Y */
686		− { 1, 0, 1, 0, 7 }, /* U */
687		− { 2, 0, 1, 0, 7 }, /* V */
688		− { 3, 0, 1, 0, 7 }, /* A */
	688	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	689	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
	690	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
	691	+ { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
689	692	},
690	693	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
691	694	},
@@ -695,10 +698,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
695	698	.log2_chroma_w = 1,
696	699	.log2_chroma_h = 1,
697	700	.comp = {
698		− { 0, 1, 1, 0, 8 }, /* Y */
699		− { 1, 1, 1, 0, 8 }, /* U */
700		− { 2, 1, 1, 0, 8 }, /* V */
701		− { 3, 1, 1, 0, 8 }, /* A */
	701	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	702	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	703	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	704	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
702	705	},
703	706	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
704	707	},
@@ -708,10 +711,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
708	711	.log2_chroma_w = 1,
709	712	.log2_chroma_h = 1,
710	713	.comp = {
711		− { 0, 1, 1, 0, 8 }, /* Y */
712		− { 1, 1, 1, 0, 8 }, /* U */
713		− { 2, 1, 1, 0, 8 }, /* V */
714		− { 3, 1, 1, 0, 8 }, /* A */
	714	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	715	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	716	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	717	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
715	718	},
716	719	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
717	720	},
@@ -721,10 +724,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
721	724	.log2_chroma_w = 1,
722	725	.log2_chroma_h = 0,
723	726	.comp = {
724		− { 0, 1, 1, 0, 8 }, /* Y */
725		− { 1, 1, 1, 0, 8 }, /* U */
726		− { 2, 1, 1, 0, 8 }, /* V */
727		− { 3, 1, 1, 0, 8 }, /* A */
	727	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	728	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	729	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	730	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
728	731	},
729	732	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
730	733	},
@@ -734,10 +737,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
734	737	.log2_chroma_w = 1,
735	738	.log2_chroma_h = 0,
736	739	.comp = {
737		− { 0, 1, 1, 0, 8 }, /* Y */
738		− { 1, 1, 1, 0, 8 }, /* U */
739		− { 2, 1, 1, 0, 8 }, /* V */
740		− { 3, 1, 1, 0, 8 }, /* A */
	740	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	741	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	742	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	743	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
741	744	},
742	745	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
743	746	},
@@ -747,10 +750,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
747	750	.log2_chroma_w = 0,
748	751	.log2_chroma_h = 0,
749	752	.comp = {
750		− { 0, 1, 1, 0, 8 }, /* Y */
751		− { 1, 1, 1, 0, 8 }, /* U */
752		− { 2, 1, 1, 0, 8 }, /* V */
753		− { 3, 1, 1, 0, 8 }, /* A */
	753	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	754	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	755	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	756	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
754	757	},
755	758	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
756	759	},
@@ -760,10 +763,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
760	763	.log2_chroma_w = 0,
761	764	.log2_chroma_h = 0,
762	765	.comp = {
763		− { 0, 1, 1, 0, 8 }, /* Y */
764		− { 1, 1, 1, 0, 8 }, /* U */
765		− { 2, 1, 1, 0, 8 }, /* V */
766		− { 3, 1, 1, 0, 8 }, /* A */
	766	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	767	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	768	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
	769	+ { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
767	770	},
768	771	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
769	772	},
@@ -773,10 +776,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
773	776	.log2_chroma_w = 1,
774	777	.log2_chroma_h = 1,
775	778	.comp = {
776		− { 0, 1, 1, 0, 9 }, /* Y */
777		− { 1, 1, 1, 0, 9 }, /* U */
778		− { 2, 1, 1, 0, 9 }, /* V */
779		− { 3, 1, 1, 0, 9 }, /* A */
	779	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	780	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	781	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	782	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
780	783	},
781	784	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
782	785	},
@@ -786,10 +789,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
786	789	.log2_chroma_w = 1,
787	790	.log2_chroma_h = 1,
788	791	.comp = {
789		− { 0, 1, 1, 0, 9 }, /* Y */
790		− { 1, 1, 1, 0, 9 }, /* U */
791		− { 2, 1, 1, 0, 9 }, /* V */
792		− { 3, 1, 1, 0, 9 }, /* A */
	792	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	793	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	794	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	795	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
793	796	},
794	797	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
795	798	},
@@ -799,10 +802,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
799	802	.log2_chroma_w = 1,
800	803	.log2_chroma_h = 0,
801	804	.comp = {
802		− { 0, 1, 1, 0, 9 }, /* Y */
803		− { 1, 1, 1, 0, 9 }, /* U */
804		− { 2, 1, 1, 0, 9 }, /* V */
805		− { 3, 1, 1, 0, 9 }, /* A */
	805	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	806	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	807	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	808	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
806	809	},
807	810	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
808	811	},
@@ -812,10 +815,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
812	815	.log2_chroma_w = 1,
813	816	.log2_chroma_h = 0,
814	817	.comp = {
815		− { 0, 1, 1, 0, 9 }, /* Y */
816		− { 1, 1, 1, 0, 9 }, /* U */
817		− { 2, 1, 1, 0, 9 }, /* V */
818		− { 3, 1, 1, 0, 9 }, /* A */
	818	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	819	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	820	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	821	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
819	822	},
820	823	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
821	824	},
@@ -825,10 +828,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
825	828	.log2_chroma_w = 0,
826	829	.log2_chroma_h = 0,
827	830	.comp = {
828		− { 0, 1, 1, 0, 9 }, /* Y */
829		− { 1, 1, 1, 0, 9 }, /* U */
830		− { 2, 1, 1, 0, 9 }, /* V */
831		− { 3, 1, 1, 0, 9 }, /* A */
	831	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	832	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	833	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	834	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
832	835	},
833	836	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
834	837	},
@@ -838,10 +841,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
838	841	.log2_chroma_w = 0,
839	842	.log2_chroma_h = 0,
840	843	.comp = {
841		− { 0, 1, 1, 0, 9 }, /* Y */
842		− { 1, 1, 1, 0, 9 }, /* U */
843		− { 2, 1, 1, 0, 9 }, /* V */
844		− { 3, 1, 1, 0, 9 }, /* A */
	844	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	845	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	846	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
	847	+ { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
845	848	},
846	849	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
847	850	},
@@ -851,10 +854,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
851	854	.log2_chroma_w = 1,
852	855	.log2_chroma_h = 1,
853	856	.comp = {
854		− { 0, 1, 1, 0, 15 }, /* Y */
855		− { 1, 1, 1, 0, 15 }, /* U */
856		− { 2, 1, 1, 0, 15 }, /* V */
857		− { 3, 1, 1, 0, 15 }, /* A */
	857	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	858	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	859	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	860	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
858	861	},
859	862	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
860	863	},
@@ -864,10 +867,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
864	867	.log2_chroma_w = 1,
865	868	.log2_chroma_h = 1,
866	869	.comp = {
867		− { 0, 1, 1, 0, 15 }, /* Y */
868		− { 1, 1, 1, 0, 15 }, /* U */
869		− { 2, 1, 1, 0, 15 }, /* V */
870		− { 3, 1, 1, 0, 15 }, /* A */
	870	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	871	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	872	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	873	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
871	874	},
872	875	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
873	876	},
@@ -877,10 +880,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
877	880	.log2_chroma_w = 1,
878	881	.log2_chroma_h = 0,
879	882	.comp = {
880		− { 0, 1, 1, 0, 15 }, /* Y */
881		− { 1, 1, 1, 0, 15 }, /* U */
882		− { 2, 1, 1, 0, 15 }, /* V */
883		− { 3, 1, 1, 0, 15 }, /* A */
	883	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	884	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	885	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	886	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
884	887	},
885	888	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
886	889	},
@@ -890,10 +893,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
890	893	.log2_chroma_w = 1,
891	894	.log2_chroma_h = 0,
892	895	.comp = {
893		− { 0, 1, 1, 0, 15 }, /* Y */
894		− { 1, 1, 1, 0, 15 }, /* U */
895		− { 2, 1, 1, 0, 15 }, /* V */
896		− { 3, 1, 1, 0, 15 }, /* A */
	896	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	897	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	898	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	899	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
897	900	},
898	901	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
899	902	},
@@ -903,10 +906,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
903	906	.log2_chroma_w = 0,
904	907	.log2_chroma_h = 0,
905	908	.comp = {
906		− { 0, 1, 1, 0, 15 }, /* Y */
907		− { 1, 1, 1, 0, 15 }, /* U */
908		− { 2, 1, 1, 0, 15 }, /* V */
909		− { 3, 1, 1, 0, 15 }, /* A */
	909	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	910	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	911	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	912	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
910	913	},
911	914	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
912	915	},
@@ -916,10 +919,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
916	919	.log2_chroma_w = 0,
917	920	.log2_chroma_h = 0,
918	921	.comp = {
919		− { 0, 1, 1, 0, 15 }, /* Y */
920		− { 1, 1, 1, 0, 15 }, /* U */
921		− { 2, 1, 1, 0, 15 }, /* V */
922		− { 3, 1, 1, 0, 15 }, /* A */
	922	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	923	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	924	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
	925	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
923	926	},
924	927	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_ALPHA,
925	928	},
@@ -967,9 +970,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 41 unmodified lines
967	970	.log2_chroma_w = 0,
968	971	.log2_chroma_h = 0,
969	972	.comp = {
970		− { 0, 5, 1, 0, 15 }, /* R */
971		− { 0, 5, 3, 0, 15 }, /* G */
972		− { 0, 5, 5, 0, 15 }, /* B */
	973	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */
	974	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	975	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */
973	976	},
974	977	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_BE,
975	978	},
@@ -979,9 +982,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
979	982	.log2_chroma_w = 0,
980	983	.log2_chroma_h = 0,
981	984	.comp = {
982		− { 0, 5, 1, 0, 15 }, /* R */
983		− { 0, 5, 3, 0, 15 }, /* G */
984		− { 0, 5, 5, 0, 15 }, /* B */
	985	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */
	986	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	987	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */
985	988	},
986	989	.flags = AV_PIX_FMT_FLAG_RGB,
987	990	},
@@ -991,10 +994,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
991	994	.log2_chroma_w = 0,
992	995	.log2_chroma_h = 0,
993	996	.comp = {
994		− { 0, 7, 1, 0, 15 }, /* R */
995		− { 0, 7, 3, 0, 15 }, /* G */
996		− { 0, 7, 5, 0, 15 }, /* B */
997		− { 0, 7, 7, 0, 15 }, /* A */
	997	+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */
	998	+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
	999	+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */
	1000	+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
998	1001	},
999	1002	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
1000	1003	},
@@ -1004,10 +1007,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1004	1007	.log2_chroma_w = 0,
1005	1008	.log2_chroma_h = 0,
1006	1009	.comp = {
1007		− { 0, 7, 1, 0, 15 }, /* R */
1008		− { 0, 7, 3, 0, 15 }, /* G */
1009		− { 0, 7, 5, 0, 15 }, /* B */
1010		− { 0, 7, 7, 0, 15 }, /* A */
	1010	+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */
	1011	+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
	1012	+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */
	1013	+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
1011	1014	},
1012	1015	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
1013	1016	},
@@ -1017,9 +1020,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1017	1020	.log2_chroma_w = 0,
1018	1021	.log2_chroma_h = 0,
1019	1022	.comp = {
1020		− { 0, 1, 0, 3, 4 }, /* R */
1021		− { 0, 1, 1, 5, 5 }, /* G */
1022		− { 0, 1, 1, 0, 4 }, /* B */
	1023	+ { 0, 2, -1, 3, 5, 1, 4, 0 }, /* R */
	1024	+ { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
	1025	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
1023	1026	},
1024	1027	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1025	1028	},
@@ -1029,9 +1032,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1029	1032	.log2_chroma_w = 0,
1030	1033	.log2_chroma_h = 0,
1031	1034	.comp = {
1032		− { 0, 1, 2, 3, 4 }, /* R */
1033		− { 0, 1, 1, 5, 5 }, /* G */
1034		− { 0, 1, 1, 0, 4 }, /* B */
	1035	+ { 0, 2, 1, 3, 5, 1, 4, 2 }, /* R */
	1036	+ { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
	1037	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
1035	1038	},
1036	1039	.flags = AV_PIX_FMT_FLAG_RGB,
1037	1040	},
@@ -1041,9 +1044,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1041	1044	.log2_chroma_w = 0,
1042	1045	.log2_chroma_h = 0,
1043	1046	.comp = {
1044		− { 0, 1, 0, 2, 4 }, /* R */
1045		− { 0, 1, 1, 5, 4 }, /* G */
1046		− { 0, 1, 1, 0, 4 }, /* B */
	1047	+ { 0, 2, -1, 2, 5, 1, 4, 0 }, /* R */
	1048	+ { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
	1049	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
1047	1050	},
1048	1051	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1049	1052	},
@@ -1053,9 +1056,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1053	1056	.log2_chroma_w = 0,
1054	1057	.log2_chroma_h = 0,
1055	1058	.comp = {
1056		− { 0, 1, 2, 2, 4 }, /* R */
1057		− { 0, 1, 1, 5, 4 }, /* G */
1058		− { 0, 1, 1, 0, 4 }, /* B */
	1059	+ { 0, 2, 1, 2, 5, 1, 4, 2 }, /* R */
	1060	+ { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
	1061	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
1059	1062	},
1060	1063	.flags = AV_PIX_FMT_FLAG_RGB,
1061	1064	},
@@ -1065,9 +1068,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1065	1068	.log2_chroma_w = 0,
1066	1069	.log2_chroma_h = 0,
1067	1070	.comp = {
1068		− { 0, 1, 0, 0, 3 }, /* R */
1069		− { 0, 1, 1, 4, 3 }, /* G */
1070		− { 0, 1, 1, 0, 3 }, /* B */
	1071	+ { 0, 2, -1, 0, 4, 1, 3, 0 }, /* R */
	1072	+ { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
	1073	+ { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */
1071	1074	},
1072	1075	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1073	1076	},
@@ -1077,9 +1080,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1077	1080	.log2_chroma_w = 0,
1078	1081	.log2_chroma_h = 0,
1079	1082	.comp = {
1080		− { 0, 1, 2, 0, 3 }, /* R */
1081		− { 0, 1, 1, 4, 3 }, /* G */
1082		− { 0, 1, 1, 0, 3 }, /* B */
	1083	+ { 0, 2, 1, 0, 4, 1, 3, 2 }, /* R */
	1084	+ { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
	1085	+ { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */
1083	1086	},
1084	1087	.flags = AV_PIX_FMT_FLAG_RGB,
1085	1088	},
@@ -1089,9 +1092,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1089	1092	.log2_chroma_w = 0,
1090	1093	.log2_chroma_h = 0,
1091	1094	.comp = {
1092		− { 0, 5, 5, 0, 15 }, /* R */
1093		− { 0, 5, 3, 0, 15 }, /* G */
1094		− { 0, 5, 1, 0, 15 }, /* B */
	1095	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
	1096	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	1097	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
1095	1098	},
1096	1099	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1097	1100	},
@@ -1101,9 +1104,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1101	1104	.log2_chroma_w = 0,
1102	1105	.log2_chroma_h = 0,
1103	1106	.comp = {
1104		− { 0, 5, 5, 0, 15 }, /* R */
1105		− { 0, 5, 3, 0, 15 }, /* G */
1106		− { 0, 5, 1, 0, 15 }, /* B */
	1107	+ { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
	1108	+ { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
	1109	+ { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
1107	1110	},
1108	1111	.flags = AV_PIX_FMT_FLAG_RGB,
1109	1112	},
@@ -1113,10 +1116,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1113	1116	.log2_chroma_w = 0,
1114	1117	.log2_chroma_h = 0,
1115	1118	.comp = {
1116		− { 0, 7, 5, 0, 15 }, /* R */
1117		− { 0, 7, 3, 0, 15 }, /* G */
1118		− { 0, 7, 1, 0, 15 }, /* B */
1119		− { 0, 7, 7, 0, 15 }, /* A */
	1119	+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */
	1120	+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
	1121	+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */
	1122	+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
1120	1123	},
1121	1124	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
1122	1125	},
@@ -1126,10 +1129,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1126	1129	.log2_chroma_w = 0,
1127	1130	.log2_chroma_h = 0,
1128	1131	.comp = {
1129		− { 0, 7, 5, 0, 15 }, /* R */
1130		− { 0, 7, 3, 0, 15 }, /* G */
1131		− { 0, 7, 1, 0, 15 }, /* B */
1132		− { 0, 7, 7, 0, 15 }, /* A */
	1132	+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */
	1133	+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
	1134	+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */
	1135	+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
1133	1136	},
1134	1137	.flags = AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
1135	1138	},
@@ -1139,9 +1142,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1139	1142	.log2_chroma_w = 0,
1140	1143	.log2_chroma_h = 0,
1141	1144	.comp = {
1142		− { 0, 1, 1, 0, 4 }, /* R */
1143		− { 0, 1, 1, 5, 5 }, /* G */
1144		− { 0, 1, 0, 3, 4 }, /* B */
	1145	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
	1146	+ { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
	1147	+ { 0, 2, -1, 3, 5, 1, 4, 0 }, /* B */
1145	1148	},
1146	1149	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1147	1150	},
@@ -1151,9 +1154,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1151	1154	.log2_chroma_w = 0,
1152	1155	.log2_chroma_h = 0,
1153	1156	.comp = {
1154		− { 0, 1, 1, 0, 4 }, /* R */
1155		− { 0, 1, 1, 5, 5 }, /* G */
1156		− { 0, 1, 2, 3, 4 }, /* B */
	1157	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
	1158	+ { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
	1159	+ { 0, 2, 1, 3, 5, 1, 4, 2 }, /* B */
1157	1160	},
1158	1161	.flags = AV_PIX_FMT_FLAG_RGB,
1159	1162	},
@@ -1163,9 +1166,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1163	1166	.log2_chroma_w = 0,
1164	1167	.log2_chroma_h = 0,
1165	1168	.comp = {
1166		− { 0, 1, 1, 0, 4 }, /* R */
1167		− { 0, 1, 1, 5, 4 }, /* G */
1168		− { 0, 1, 0, 2, 4 }, /* B */
	1169	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
	1170	+ { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
	1171	+ { 0, 2, -1, 2, 5, 1, 4, 0 }, /* B */
1169	1172	},
1170	1173	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1171	1174	},
@@ -1175,9 +1178,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1175	1178	.log2_chroma_w = 0,
1176	1179	.log2_chroma_h = 0,
1177	1180	.comp = {
1178		− { 0, 1, 1, 0, 4 }, /* R */
1179		− { 0, 1, 1, 5, 4 }, /* G */
1180		− { 0, 1, 2, 2, 4 }, /* B */
	1181	+ { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
	1182	+ { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
	1183	+ { 0, 2, 1, 2, 5, 1, 4, 2 }, /* B */
1181	1184	},
1182	1185	.flags = AV_PIX_FMT_FLAG_RGB,
1183	1186	},
@@ -1187,9 +1190,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1187	1190	.log2_chroma_w = 0,
1188	1191	.log2_chroma_h = 0,
1189	1192	.comp = {
1190		− { 0, 1, 1, 0, 3 }, /* R */
1191		− { 0, 1, 1, 4, 3 }, /* G */
1192		− { 0, 1, 0, 0, 3 }, /* B */
	1193	+ { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */
	1194	+ { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
	1195	+ { 0, 2, -1, 0, 4, 1, 3, 0 }, /* B */
1193	1196	},
1194	1197	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_RGB,
1195	1198	},
@@ -1199,9 +1202,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1199	1202	.log2_chroma_w = 0,
1200	1203	.log2_chroma_h = 0,
1201	1204	.comp = {
1202		− { 0, 1, 1, 0, 3 }, /* R */
1203		− { 0, 1, 1, 4, 3 }, /* G */
1204		− { 0, 1, 2, 0, 3 }, /* B */
	1205	+ { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */
	1206	+ { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
	1207	+ { 0, 2, 1, 0, 4, 1, 3, 2 }, /* B */
1205	1208	},
1206	1209	.flags = AV_PIX_FMT_FLAG_RGB,
1207	1210	},
@@ -1238,9 +1241,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 30 unmodified lines
1238	1241	.log2_chroma_w = 1,
1239	1242	.log2_chroma_h = 1,
1240	1243	.comp = {
1241		− { 0, 1, 1, 0, 8 }, /* Y */
1242		− { 1, 1, 1, 0, 8 }, /* U */
1243		− { 2, 1, 1, 0, 8 }, /* V */
	1244	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1245	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1246	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1244	1247	},
1245	1248	.flags = AV_PIX_FMT_FLAG_PLANAR,
1246	1249	},
@@ -1250,9 +1253,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1250	1253	.log2_chroma_w = 1,
1251	1254	.log2_chroma_h = 1,
1252	1255	.comp = {
1253		− { 0, 1, 1, 0, 8 }, /* Y */
1254		− { 1, 1, 1, 0, 8 }, /* U */
1255		− { 2, 1, 1, 0, 8 }, /* V */
	1256	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1257	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1258	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1256	1259	},
1257	1260	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1258	1261	},
@@ -1262,9 +1265,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1262	1265	.log2_chroma_w = 1,
1263	1266	.log2_chroma_h = 1,
1264	1267	.comp = {
1265		− { 0, 1, 1, 0, 9 }, /* Y */
1266		− { 1, 1, 1, 0, 9 }, /* U */
1267		− { 2, 1, 1, 0, 9 }, /* V */
	1268	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1269	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1270	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1268	1271	},
1269	1272	.flags = AV_PIX_FMT_FLAG_PLANAR,
1270	1273	},
@@ -1274,9 +1277,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1274	1277	.log2_chroma_w = 1,
1275	1278	.log2_chroma_h = 1,
1276	1279	.comp = {
1277		− { 0, 1, 1, 0, 9 }, /* Y */
1278		− { 1, 1, 1, 0, 9 }, /* U */
1279		− { 2, 1, 1, 0, 9 }, /* V */
	1280	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1281	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1282	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1280	1283	},
1281	1284	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1282	1285	},
@@ -1286,9 +1289,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1286	1289	.log2_chroma_w = 1,
1287	1290	.log2_chroma_h = 1,
1288	1291	.comp = {
1289		− { 0, 1, 1, 0, 11 }, /* Y */
1290		− { 1, 1, 1, 0, 11 }, /* U */
1291		− { 2, 1, 1, 0, 11 }, /* V */
	1292	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
	1293	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
	1294	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1292	1295	},
1293	1296	.flags = AV_PIX_FMT_FLAG_PLANAR,
1294	1297	},
@@ -1298,9 +1301,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1298	1301	.log2_chroma_w = 1,
1299	1302	.log2_chroma_h = 1,
1300	1303	.comp = {
1301		− { 0, 1, 1, 0, 11 }, /* Y */
1302		− { 1, 1, 1, 0, 11 }, /* U */
1303		− { 2, 1, 1, 0, 11 }, /* V */
	1304	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
	1305	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
	1306	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1304	1307	},
1305	1308	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1306	1309	},
@@ -1310,9 +1313,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1310	1313	.log2_chroma_w = 1,
1311	1314	.log2_chroma_h = 1,
1312	1315	.comp = {
1313		− { 0, 1, 1, 0, 13 }, /* Y */
1314		− { 1, 1, 1, 0, 13 }, /* U */
1315		− { 2, 1, 1, 0, 13 }, /* V */
	1316	+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
	1317	+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
	1318	+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1316	1319	},
1317	1320	.flags = AV_PIX_FMT_FLAG_PLANAR,
1318	1321	},
@@ -1322,9 +1325,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1322	1325	.log2_chroma_w = 1,
1323	1326	.log2_chroma_h = 1,
1324	1327	.comp = {
1325		− { 0, 1, 1, 0, 13 }, /* Y */
1326		− { 1, 1, 1, 0, 13 }, /* U */
1327		− { 2, 1, 1, 0, 13 }, /* V */
	1328	+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
	1329	+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
	1330	+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1328	1331	},
1329	1332	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1330	1333	},
@@ -1334,9 +1337,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1334	1337	.log2_chroma_w = 1,
1335	1338	.log2_chroma_h = 1,
1336	1339	.comp = {
1337		− { 0, 1, 1, 0, 15 }, /* Y */
1338		− { 1, 1, 1, 0, 15 }, /* U */
1339		− { 2, 1, 1, 0, 15 }, /* V */
	1340	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1341	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1342	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1340	1343	},
1341	1344	.flags = AV_PIX_FMT_FLAG_PLANAR,
1342	1345	},
@@ -1346,9 +1349,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1346	1349	.log2_chroma_w = 1,
1347	1350	.log2_chroma_h = 1,
1348	1351	.comp = {
1349		− { 0, 1, 1, 0, 15 }, /* Y */
1350		− { 1, 1, 1, 0, 15 }, /* U */
1351		− { 2, 1, 1, 0, 15 }, /* V */
	1352	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1353	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1354	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1352	1355	},
1353	1356	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1354	1357	},
@@ -1358,9 +1361,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1358	1361	.log2_chroma_w = 1,
1359	1362	.log2_chroma_h = 0,
1360	1363	.comp = {
1361		− { 0, 1, 1, 0, 8 }, /* Y */
1362		− { 1, 1, 1, 0, 8 }, /* U */
1363		− { 2, 1, 1, 0, 8 }, /* V */
	1364	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1365	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1366	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1364	1367	},
1365	1368	.flags = AV_PIX_FMT_FLAG_PLANAR,
1366	1369	},
@@ -1370,9 +1373,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1370	1373	.log2_chroma_w = 1,
1371	1374	.log2_chroma_h = 0,
1372	1375	.comp = {
1373		− { 0, 1, 1, 0, 8 }, /* Y */
1374		− { 1, 1, 1, 0, 8 }, /* U */
1375		− { 2, 1, 1, 0, 8 }, /* V */
	1376	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1377	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1378	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1376	1379	},
1377	1380	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1378	1381	},
@@ -1382,9 +1385,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1382	1385	.log2_chroma_w = 1,
1383	1386	.log2_chroma_h = 0,
1384	1387	.comp = {
1385		− { 0, 1, 1, 0, 9 }, /* Y */
1386		− { 1, 1, 1, 0, 9 }, /* U */
1387		− { 2, 1, 1, 0, 9 }, /* V */
	1388	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1389	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1390	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1388	1391	},
1389	1392	.flags = AV_PIX_FMT_FLAG_PLANAR,
1390	1393	},
@@ -1394,9 +1397,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1394	1397	.log2_chroma_w = 1,
1395	1398	.log2_chroma_h = 0,
1396	1399	.comp = {
1397		− { 0, 1, 1, 0, 9 }, /* Y */
1398		− { 1, 1, 1, 0, 9 }, /* U */
1399		− { 2, 1, 1, 0, 9 }, /* V */
	1400	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1401	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1402	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1400	1403	},
1401	1404	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1402	1405	},
@@ -1406,9 +1409,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1406	1409	.log2_chroma_w = 1,
1407	1410	.log2_chroma_h = 0,
1408	1411	.comp = {
1409		− { 0, 1, 1, 0, 11 }, /* Y */
1410		− { 1, 1, 1, 0, 11 }, /* U */
1411		− { 2, 1, 1, 0, 11 }, /* V */
	1412	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
	1413	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
	1414	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1412	1415	},
1413	1416	.flags = AV_PIX_FMT_FLAG_PLANAR,
1414	1417	},
@@ -1418,9 +1421,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1418	1421	.log2_chroma_w = 1,
1419	1422	.log2_chroma_h = 0,
1420	1423	.comp = {
1421		− { 0, 1, 1, 0, 11 }, /* Y */
1422		− { 1, 1, 1, 0, 11 }, /* U */
1423		− { 2, 1, 1, 0, 11 }, /* V */
	1424	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
	1425	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
	1426	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1424	1427	},
1425	1428	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1426	1429	},
@@ -1430,9 +1433,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1430	1433	.log2_chroma_w = 1,
1431	1434	.log2_chroma_h = 0,
1432	1435	.comp = {
1433		− { 0, 1, 1, 0, 13 }, /* Y */
1434		− { 1, 1, 1, 0, 13 }, /* U */
1435		− { 2, 1, 1, 0, 13 }, /* V */
	1436	+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
	1437	+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
	1438	+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1436	1439	},
1437	1440	.flags = AV_PIX_FMT_FLAG_PLANAR,
1438	1441	},
@@ -1442,9 +1445,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1442	1445	.log2_chroma_w = 1,
1443	1446	.log2_chroma_h = 0,
1444	1447	.comp = {
1445		− { 0, 1, 1, 0, 13 }, /* Y */
1446		− { 1, 1, 1, 0, 13 }, /* U */
1447		− { 2, 1, 1, 0, 13 }, /* V */
	1448	+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
	1449	+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
	1450	+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1448	1451	},
1449	1452	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1450	1453	},
@@ -1454,9 +1457,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1454	1457	.log2_chroma_w = 1,
1455	1458	.log2_chroma_h = 0,
1456	1459	.comp = {
1457		− { 0, 1, 1, 0, 15 }, /* Y */
1458		− { 1, 1, 1, 0, 15 }, /* U */
1459		− { 2, 1, 1, 0, 15 }, /* V */
	1460	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1461	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1462	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1460	1463	},
1461	1464	.flags = AV_PIX_FMT_FLAG_PLANAR,
1462	1465	},
@@ -1466,9 +1469,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1466	1469	.log2_chroma_w = 1,
1467	1470	.log2_chroma_h = 0,
1468	1471	.comp = {
1469		− { 0, 1, 1, 0, 15 }, /* Y */
1470		− { 1, 1, 1, 0, 15 }, /* U */
1471		− { 2, 1, 1, 0, 15 }, /* V */
	1472	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1473	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1474	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1472	1475	},
1473	1476	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1474	1477	},
@@ -1478,9 +1481,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1478	1481	.log2_chroma_w = 0,
1479	1482	.log2_chroma_h = 0,
1480	1483	.comp = {
1481		− { 0, 1, 1, 0, 15 }, /* Y */
1482		− { 1, 1, 1, 0, 15 }, /* U */
1483		− { 2, 1, 1, 0, 15 }, /* V */
	1484	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1485	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1486	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1484	1487	},
1485	1488	.flags = AV_PIX_FMT_FLAG_PLANAR,
1486	1489	},
@@ -1490,9 +1493,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1490	1493	.log2_chroma_w = 0,
1491	1494	.log2_chroma_h = 0,
1492	1495	.comp = {
1493		− { 0, 1, 1, 0, 15 }, /* Y */
1494		− { 1, 1, 1, 0, 15 }, /* U */
1495		− { 2, 1, 1, 0, 15 }, /* V */
	1496	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
	1497	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
	1498	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1496	1499	},
1497	1500	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1498	1501	},
@@ -1502,9 +1505,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1502	1505	.log2_chroma_w = 0,
1503	1506	.log2_chroma_h = 0,
1504	1507	.comp = {
1505		− { 0, 1, 1, 0, 9 }, /* Y */
1506		− { 1, 1, 1, 0, 9 }, /* U */
1507		− { 2, 1, 1, 0, 9 }, /* V */
	1508	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1509	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1510	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1508	1511	},
1509	1512	.flags = AV_PIX_FMT_FLAG_PLANAR,
1510	1513	},
@@ -1514,9 +1517,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1514	1517	.log2_chroma_w = 0,
1515	1518	.log2_chroma_h = 0,
1516	1519	.comp = {
1517		− { 0, 1, 1, 0, 9 }, /* Y */
1518		− { 1, 1, 1, 0, 9 }, /* U */
1519		− { 2, 1, 1, 0, 9 }, /* V */
	1520	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1521	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
	1522	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1520	1523	},
1521	1524	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1522	1525	},
@@ -1526,9 +1529,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1526	1529	.log2_chroma_w = 0,
1527	1530	.log2_chroma_h = 0,
1528	1531	.comp = {
1529		− { 0, 1, 1, 0, 8 }, /* Y */
1530		− { 1, 1, 1, 0, 8 }, /* U */
1531		− { 2, 1, 1, 0, 8 }, /* V */
	1532	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1533	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1534	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1532	1535	},
1533	1536	.flags = AV_PIX_FMT_FLAG_PLANAR,
1534	1537	},
@@ -1538,9 +1541,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1538	1541	.log2_chroma_w = 0,
1539	1542	.log2_chroma_h = 0,
1540	1543	.comp = {
1541		− { 0, 1, 1, 0, 8 }, /* Y */
1542		− { 1, 1, 1, 0, 8 }, /* U */
1543		− { 2, 1, 1, 0, 8 }, /* V */
	1544	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
	1545	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
	1546	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1544	1547	},
1545	1548	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1546	1549	},
@@ -1550,9 +1553,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1550	1553	.log2_chroma_w = 0,
1551	1554	.log2_chroma_h = 0,
1552	1555	.comp = {
1553		− { 0, 1, 1, 0, 11 }, /* Y */
1554		− { 1, 1, 1, 0, 11 }, /* U */
1555		− { 2, 1, 1, 0, 11 }, /* V */
	1556	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
	1557	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
	1558	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1556	1559	},
1557	1560	.flags = AV_PIX_FMT_FLAG_PLANAR,
1558	1561	},
@@ -1562,9 +1565,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1562	1565	.log2_chroma_w = 0,
1563	1566	.log2_chroma_h = 0,
1564	1567	.comp = {
1565		− { 0, 1, 1, 0, 11 }, /* Y */
1566		− { 1, 1, 1, 0, 11 }, /* U */
1567		− { 2, 1, 1, 0, 11 }, /* V */
	1568	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
	1569	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
	1570	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1568	1571	},
1569	1572	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1570	1573	},
@@ -1574,9 +1577,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1574	1577	.log2_chroma_w = 0,
1575	1578	.log2_chroma_h = 0,
1576	1579	.comp = {
1577		− { 0, 1, 1, 0, 13 }, /* Y */
1578		− { 1, 1, 1, 0, 13 }, /* U */
1579		− { 2, 1, 1, 0, 13 }, /* V */
	1580	+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
	1581	+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
	1582	+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1580	1583	},
1581	1584	.flags = AV_PIX_FMT_FLAG_PLANAR,
1582	1585	},
@@ -1586,9 +1589,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1586	1589	.log2_chroma_w = 0,
1587	1590	.log2_chroma_h = 0,
1588	1591	.comp = {
1589		− { 0, 1, 1, 0, 13 }, /* Y */
1590		− { 1, 1, 1, 0, 13 }, /* U */
1591		− { 2, 1, 1, 0, 13 }, /* V */
	1592	+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
	1593	+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
	1594	+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1592	1595	},
1593	1596	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR,
1594	1597	},
@@ -1614,8 +1617,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 19 unmodified lines
1614	1617	.name = "ya8",
1615	1618	.nb_components = 2,
1616	1619	.comp = {
1617		− { 0, 1, 1, 0, 7 }, /* Y */
1618		− { 0, 1, 2, 0, 7 }, /* A */
	1620	+ { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
	1621	+ { 0, 2, 1, 0, 8, 1, 7, 2 }, /* A */
1619	1622	},
1620	1623	.flags = AV_PIX_FMT_FLAG_ALPHA,
1621	1624	.alias = "gray8a",
@@ -1624,8 +1627,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
1624	1627	.name = "ya16le",
1625	1628	.nb_components = 2,
1626	1629	.comp = {
1627		− { 0, 3, 1, 0, 15 }, /* Y */
1628		− { 0, 3, 3, 0, 15 }, /* A */
	1630	+ { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */
	1631	+ { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */
1629	1632	},
1630	1633	.flags = AV_PIX_FMT_FLAG_ALPHA,
1631	1634	},
@@ -1633,8 +1636,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1 unmodified line
1633	1636	.name = "ya16be",
1634	1637	.nb_components = 2,
1635	1638	.comp = {
1636		− { 0, 3, 1, 0, 15 }, /* Y */
1637		− { 0, 3, 3, 0, 15 }, /* A */
	1639	+ { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */
	1640	+ { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */
1638	1641	},
1639	1642	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_ALPHA,
1640	1643	},
@@ -1648,9 +1651,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 7 unmodified lines
1648	1651	.log2_chroma_w = 0,
1649	1652	.log2_chroma_h = 0,
1650	1653	.comp = {
1651		− { 2, 0, 1, 0, 7 }, /* R */
1652		− { 0, 0, 1, 0, 7 }, /* G */
1653		− { 1, 0, 1, 0, 7 }, /* B */
	1654	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */
	1655	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */
	1656	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */
1654	1657	},
1655	1658	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1656	1659	},
@@ -1660,9 +1663,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1660	1663	.log2_chroma_w = 0,
1661	1664	.log2_chroma_h = 0,
1662	1665	.comp = {
1663		− { 2, 1, 1, 0, 8 }, /* R */
1664		− { 0, 1, 1, 0, 8 }, /* G */
1665		− { 1, 1, 1, 0, 8 }, /* B */
	1666	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */
	1667	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */
	1668	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */
1666	1669	},
1667	1670	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1668	1671	},
@@ -1672,9 +1675,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1672	1675	.log2_chroma_w = 0,
1673	1676	.log2_chroma_h = 0,
1674	1677	.comp = {
1675		− { 2, 1, 1, 0, 8 }, /* R */
1676		− { 0, 1, 1, 0, 8 }, /* G */
1677		− { 1, 1, 1, 0, 8 }, /* B */
	1678	+ { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */
	1679	+ { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */
	1680	+ { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */
1678	1681	},
1679	1682	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1680	1683	},
@@ -1684,9 +1687,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1684	1687	.log2_chroma_w = 0,
1685	1688	.log2_chroma_h = 0,
1686	1689	.comp = {
1687		− { 2, 1, 1, 0, 9 }, /* R */
1688		− { 0, 1, 1, 0, 9 }, /* G */
1689		− { 1, 1, 1, 0, 9 }, /* B */
	1690	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
	1691	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
	1692	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
1690	1693	},
1691	1694	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1692	1695	},
@@ -1696,9 +1699,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1696	1699	.log2_chroma_w = 0,
1697	1700	.log2_chroma_h = 0,
1698	1701	.comp = {
1699		− { 2, 1, 1, 0, 9 }, /* R */
1700		− { 0, 1, 1, 0, 9 }, /* G */
1701		− { 1, 1, 1, 0, 9 }, /* B */
	1702	+ { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
	1703	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
	1704	+ { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
1702	1705	},
1703	1706	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1704	1707	},
@@ -1708,9 +1711,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1708	1711	.log2_chroma_w = 0,
1709	1712	.log2_chroma_h = 0,
1710	1713	.comp = {
1711		− { 2, 1, 1, 0, 11 }, /* R */
1712		− { 0, 1, 1, 0, 11 }, /* G */
1713		− { 1, 1, 1, 0, 11 }, /* B */
	1714	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
	1715	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
	1716	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
1714	1717	},
1715	1718	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1716	1719	},
@@ -1720,9 +1723,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1720	1723	.log2_chroma_w = 0,
1721	1724	.log2_chroma_h = 0,
1722	1725	.comp = {
1723		− { 2, 1, 1, 0, 11 }, /* R */
1724		− { 0, 1, 1, 0, 11 }, /* G */
1725		− { 1, 1, 1, 0, 11 }, /* B */
	1726	+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
	1727	+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
	1728	+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
1726	1729	},
1727	1730	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1728	1731	},
@@ -1732,9 +1735,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1732	1735	.log2_chroma_w = 0,
1733	1736	.log2_chroma_h = 0,
1734	1737	.comp = {
1735		− { 2, 1, 1, 0, 13 }, /* R */
1736		− { 0, 1, 1, 0, 13 }, /* G */
1737		− { 1, 1, 1, 0, 13 }, /* B */
	1738	+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */
	1739	+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */
	1740	+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */
1738	1741	},
1739	1742	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1740	1743	},
@@ -1744,9 +1747,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1744	1747	.log2_chroma_w = 0,
1745	1748	.log2_chroma_h = 0,
1746	1749	.comp = {
1747		− { 2, 1, 1, 0, 13 }, /* R */
1748		− { 0, 1, 1, 0, 13 }, /* G */
1749		− { 1, 1, 1, 0, 13 }, /* B */
	1750	+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */
	1751	+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */
	1752	+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */
1750	1753	},
1751	1754	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1752	1755	},
@@ -1756,9 +1759,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1756	1759	.log2_chroma_w = 0,
1757	1760	.log2_chroma_h = 0,
1758	1761	.comp = {
1759		− { 2, 1, 1, 0, 15 }, /* R */
1760		− { 0, 1, 1, 0, 15 }, /* G */
1761		− { 1, 1, 1, 0, 15 }, /* B */
	1762	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
	1763	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
	1764	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
1762	1765	},
1763	1766	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1764	1767	},
@@ -1768,9 +1771,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1768	1771	.log2_chroma_w = 0,
1769	1772	.log2_chroma_h = 0,
1770	1773	.comp = {
1771		− { 2, 1, 1, 0, 15 }, /* R */
1772		− { 0, 1, 1, 0, 15 }, /* G */
1773		− { 1, 1, 1, 0, 15 }, /* B */
	1774	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
	1775	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
	1776	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
1774	1777	},
1775	1778	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB,
1776	1779	},
@@ -1780,10 +1783,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1780	1783	.log2_chroma_w = 0,
1781	1784	.log2_chroma_h = 0,
1782	1785	.comp = {
1783		− { 2, 0, 1, 0, 7 }, /* R */
1784		− { 0, 0, 1, 0, 7 }, /* G */
1785		− { 1, 0, 1, 0, 7 }, /* B */
1786		− { 3, 0, 1, 0, 7 }, /* A */
	1786	+ { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */
	1787	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */
	1788	+ { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */
	1789	+ { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
1787	1790	},
1788	1791	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB \|
1789	1792	AV_PIX_FMT_FLAG_ALPHA,
@@ -1794,10 +1797,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
1794	1797	.log2_chroma_w = 0,
1795	1798	.log2_chroma_h = 0,
1796	1799	.comp = {
1797		− { 2, 1, 1, 0, 15 }, /* R */
1798		− { 0, 1, 1, 0, 15 }, /* G */
1799		− { 1, 1, 1, 0, 15 }, /* B */
1800		− { 3, 1, 1, 0, 15 }, /* A */
	1800	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
	1801	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
	1802	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
	1803	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
1801	1804	},
1802	1805	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_RGB \|
1803	1806	AV_PIX_FMT_FLAG_ALPHA,
@@ -1808,10 +1811,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
1808	1811	.log2_chroma_w = 0,
1809	1812	.log2_chroma_h = 0,
1810	1813	.comp = {
1811		− { 2, 1, 1, 0, 15 }, /* R */
1812		− { 0, 1, 1, 0, 15 }, /* G */
1813		− { 1, 1, 1, 0, 15 }, /* B */
1814		− { 3, 1, 1, 0, 15 }, /* A */
	1814	+ { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
	1815	+ { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
	1816	+ { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
	1817	+ { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
1815	1818	},
1816	1819	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_PLANAR \|
1817	1820	AV_PIX_FMT_FLAG_RGB \| AV_PIX_FMT_FLAG_ALPHA,
@@ -1828,9 +1831,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 10 unmodified lines
1828	1831	.log2_chroma_w = 0,
1829	1832	.log2_chroma_h = 0,
1830	1833	.comp = {
1831		− { 0, 5, 1, 4, 11 }, /* X */
1832		− { 0, 5, 3, 4, 11 }, /* Y */
1833		− { 0, 5, 5, 4, 11 }, /* Z */
	1834	+ { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */
	1835	+ { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */
	1836	+ { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */
1834	1837	},
1835	1838	/.flags = -- not used/
1836	1839	},
@@ -1840,9 +1843,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1840	1843	.log2_chroma_w = 0,
1841	1844	.log2_chroma_h = 0,
1842	1845	.comp = {
1843		− { 0, 5, 1, 4, 11 }, /* X */
1844		− { 0, 5, 3, 4, 11 }, /* Y */
1845		− { 0, 5, 5, 4, 11 }, /* Z */
	1846	+ { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */
	1847	+ { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */
	1848	+ { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */
1846	1849	},
1847	1850	.flags = AV_PIX_FMT_FLAG_BE,
1848	1851	},
@@ -1852,9 +1855,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1852	1855	.log2_chroma_w= 0, \
1853	1856	.log2_chroma_h= 0, \
1854	1857	.comp = { \
1855		− {0,0,0,0,1}, \
1856		− {0,0,0,0,3}, \
1857		− {0,0,0,0,1}, \
	1858	+ {0,1,0,0,2,0,1,1},\
	1859	+ {0,1,0,0,4,0,3,1},\
	1860	+ {0,1,0,0,2,0,1,1},\
1858	1861	}, \
1859	1862
1860	1863	#define BAYER16_DESC_COMMON \
@@ -1862,9 +1865,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1 unmodified line
1862	1865	.log2_chroma_w= 0, \
1863	1866	.log2_chroma_h= 0, \
1864	1867	.comp = { \
1865		− {0,1,0,0, 3}, \
1866		− {0,1,0,0, 7}, \
1867		− {0,1,0,0, 3}, \
	1868	+ {0,2,0,0,4,1,3,1},\
	1869	+ {0,2,0,0,8,1,7,1},\
	1870	+ {0,2,0,0,4,1,3,1},\
1868	1871	}, \
1869	1872
1870	1873	[AV_PIX_FMT_BAYER_BGGR8] = {
@@ -1933,9 +1936,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 62 unmodified lines
1933	1936	.log2_chroma_w = 1,
1934	1937	.log2_chroma_h = 0,
1935	1938	.comp = {
1936		− { 0, 0, 1, 0, 7 }, /* Y */
1937		− { 1, 1, 1, 0, 7 }, /* U */
1938		− { 1, 1, 2, 0, 7 }, /* V */
	1939	+ { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
	1940	+ { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */
	1941	+ { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */
1939	1942	},
1940	1943	.flags = AV_PIX_FMT_FLAG_PLANAR,
1941	1944	},
@@ -1945,9 +1948,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1945	1948	.log2_chroma_w = 1,
1946	1949	.log2_chroma_h = 0,
1947	1950	.comp = {
1948		− { 0, 1, 1, 0, 9 }, /* Y */
1949		− { 1, 3, 1, 0, 9 }, /* U */
1950		− { 1, 3, 3, 0, 9 }, /* V */
	1951	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1952	+ { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */
	1953	+ { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */
1951	1954	},
1952	1955	.flags = AV_PIX_FMT_FLAG_PLANAR,
1953	1956	},
@@ -1957,9 +1960,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1957	1960	.log2_chroma_w = 1,
1958	1961	.log2_chroma_h = 0,
1959	1962	.comp = {
1960		− { 0, 1, 1, 0, 9 }, /* Y */
1961		− { 1, 3, 1, 0, 9 }, /* U */
1962		− { 1, 3, 3, 0, 9 }, /* V */
	1963	+ { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
	1964	+ { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */
	1965	+ { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */
1963	1966	},
1964	1967	.flags = AV_PIX_FMT_FLAG_PLANAR \| AV_PIX_FMT_FLAG_BE,
1965	1968	},
@@ -1981,10 +1984,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 15 unmodified lines
1981	1984	.log2_chroma_w = 0,
1982	1985	.log2_chroma_h = 0,
1983	1986	.comp = {
1984		− { 0, 7, 3, 0, 15 }, /* Y */
1985		− { 0, 7, 5, 0, 15 }, /* U */
1986		− { 0, 7, 7, 0, 15 }, /* V */
1987		− { 0, 7, 1, 0, 15 }, /* A */
	1987	+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */
	1988	+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */
	1989	+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */
	1990	+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */
1988	1991	},
1989	1992	.flags = AV_PIX_FMT_FLAG_ALPHA,
1990	1993	},
@@ -1994,14 +1997,17 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1994	1997	.log2_chroma_w = 0,
1995	1998	.log2_chroma_h = 0,
1996	1999	.comp = {
1997		− { 0, 7, 3, 0, 15 }, /* Y */
1998		− { 0, 7, 5, 0, 15 }, /* U */
1999		− { 0, 7, 7, 0, 15 }, /* V */
2000		− { 0, 7, 1, 0, 15 }, /* A */
	2000	+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */
	2001	+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */
	2002	+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */
	2003	+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */
2001	2004	},
2002	2005	.flags = AV_PIX_FMT_FLAG_BE \| AV_PIX_FMT_FLAG_ALPHA,
2003	2006	},
2004	2007	};
	2008	+#if FF_API_PLUS1_MINUS1
	2009	+FF_ENABLE_DEPRECATION_WARNINGS
	2010	+#endif
2005	2011
2006	2012	static const char *color_range_names[AVCOL_RANGE_NB] = {
2007	2013	"unknown", "tv", "pc",
@@ -2082,7 +2088,7 @@ int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc) · 74 unmodified lines
2082	2088
2083	2089	for (c = 0; c < pixdesc->nb_components; c++) {
2084	2090	int s = c == 1 \|\| c == 2 ? 0 : log2_pixels;
2085		− bits += (pixdesc->comp[c].depth_minus1 + 1) << s;
	2091	+ bits += pixdesc->comp[c].depth << s;
2086	2092	}
2087	2093
2088	2094	return bits >> log2_pixels;

libavutil/pixdesc.h+18−6

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

libavutil/version.h+4−0

@@ -105,6 +105,10 @@ · 104 unmodified lines
105	105	#ifndef FF_API_FRAME_QP
106	106	#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
107	107	#endif
	108	+#ifndef FF_API_PLUS1_MINUS1
	109	+#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56)
	110	+#endif
	111	+
108	112
109	113	/**
110	114	* @}

libswscale/output.c+2−2

@@ -1845,7 +1845,7 @@ yuv2gbrp_full_X_c(SwsContext c, const int16_t lumFilter, · 1844 unmodified lines
1845	1845	int i;
1846	1846	int hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) && alpSrc;
1847	1847	uint16_t dest16 = (uint16_t)dest;
1848		− int SH = 22 + 7 - desc->comp[0].depth_minus1;
	1848	+ int SH = 22 + 8 - desc->comp[0].depth;
1849	1849	int A = 0; // init to silence warning
1850	1850
1851	1851	for (i = 0; i < dstW; i++) {
@@ -2073,7 +2073,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, · 221 unmodified lines
2073	2073	*yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c;
2074	2074	*yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c;
2075	2075	} else if (is9_OR_10BPS(dstFormat)) {
2076		− if (desc->comp[0].depth_minus1 == 8) {
	2076	+ if (desc->comp[0].depth == 9) {
2077	2077	*yuv2planeX = isBE(dstFormat) ? yuv2planeX_9BE_c : yuv2planeX_9LE_c;
2078	2078	*yuv2plane1 = isBE(dstFormat) ? yuv2plane1_9BE_c : yuv2plane1_9LE_c;
2079	2079	} else if (desc->comp[0].depth_minus1 == 9) {

libswscale/swscale.c+3−3

@@ -87,7 +87,7 @@ static void hScale16To19_c(SwsContext c, int16_t _dst, int dstW, · 86 unmodified lines
87	87	int i;
88	88	int32_t dst = (int32_t ) _dst;
89	89	const uint16_t src = (const uint16_t ) _src;
90		− int bits = desc->comp[0].depth_minus1;
	90	+ int bits = desc->comp[0].depth - 1;
91	91	int sh = bits - 4;
92	92
93	93	if((isAnyRGB(c->srcFormat) \|\| c->srcFormat==AV_PIX_FMT_PAL8) && desc->comp[0].depth_minus1<15)
@@ -113,7 +113,7 @@ static void hScale16To15_c(SwsContext c, int16_t dst, int dstW, · 19 unmodified lines
113	113	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat);
114	114	int i;
115	115	const uint16_t src = (const uint16_t ) _src;
116		− int sh = desc->comp[0].depth_minus1;
	116	+ int sh = desc->comp[0].depth - 1;
117	117
118	118	if(sh<15)
119	119	sh= isAnyRGB(c->srcFormat) \|\| c->srcFormat==AV_PIX_FMT_PAL8 ? 13 : desc->comp[0].depth_minus1;
@@ -796,7 +796,7 @@ static int swscale(SwsContext c, const uint8_t src[], · 676 unmodified lines
796	796	if (is16BPS(dstFormat) \|\| isNBPS(dstFormat)) {
797	797	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat);
798	798	fillPlane16(dst[3], dstStride[3], length, height, lastDstY,
799		− 1, desc->comp[3].depth_minus1,
	799	+ 1, desc->comp[3].depth,
800	800	isBE(dstFormat));
801	801	} else
802	802	fillPlane(dst[3], dstStride[3], length, height, lastDstY, 255);

libswscale/swscale_internal.h+3−3

@@ -651,14 +651,14 @@ static av_always_inline int is16BPS(enum AVPixelFormat pix_fmt) · 650 unmodified lines
651	651	{
652	652	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
653	653	av_assert0(desc);
654		− return desc->comp[0].depth_minus1 == 15;
	654	+ return desc->comp[0].depth == 16;
655	655	}
656	656
657	657	static av_always_inline int is9_OR_10BPS(enum AVPixelFormat pix_fmt)
658	658	{
659	659	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
660	660	av_assert0(desc);
661		− return desc->comp[0].depth_minus1 >= 8 && desc->comp[0].depth_minus1 <= 13;
	661	+ return desc->comp[0].depth >= 9 && desc->comp[0].depth <= 14;
662	662	}
663	663
664	664	#define isNBPS(x) is9_OR_10BPS(x)
@@ -928,7 +928,7 @@ static inline void fillPlane16(uint8_t *plane, int stride, int width, int height · 263 unmodified lines
928	928	{
929	929	int i, j;
930	930	uint8_t ptr = plane + stride y;
931		− int v = alpha ? 0xFFFF>>(15-bits) : (1<<bits);
	931	+ int v = alpha ? 0xFFFF>>(16-bits) : (1<<(bits-1));
932	932	for (i = 0; i < height; i++) {
933	933	#define FILL(wfunc) \
934	934	for (j = 0; j < width; j++) {\

libswscale/swscale_unscaled.c+5−5

@@ -1417,7 +1417,7 @@ static int planarCopyWrapper(SwsContext c, const uint8_t src[], · 1416 unmodified lines
1417	1417	if (!src[plane] \|\| (plane == 1 && !src[2])) {
1418	1418	if (is16BPS(c->dstFormat) \|\| isNBPS(c->dstFormat)) {
1419	1419	fillPlane16(dst[plane], dstStride[plane], length, height, y,
1420		− plane == 3, desc_dst->comp[plane].depth_minus1,
	1420	+ plane == 3, desc_dst->comp[plane].depth,
1421	1421	isBE(c->dstFormat));
1422	1422	} else {
1423	1423	fillPlane(dst[plane], dstStride[plane], length, height, y,
@@ -1427,8 +1427,8 @@ static int planarCopyWrapper(SwsContext c, const uint8_t src[], · 3 unmodified lines
1427	1427	if(isNBPS(c->srcFormat) \|\| isNBPS(c->dstFormat)
1428	1428	\|\| (is16BPS(c->srcFormat) != is16BPS(c->dstFormat))
1429	1429	) {
1430		− const int src_depth = desc_src->comp[plane].depth_minus1 + 1;
1431		− const int dst_depth = desc_dst->comp[plane].depth_minus1 + 1;
	1430	+ const int src_depth = desc_src->comp[plane].depth;
	1431	+ const int dst_depth = desc_dst->comp[plane].depth;
1432	1432	const uint16_t srcPtr2 = (const uint16_t ) srcPtr;
1433	1433	uint16_t dstPtr2 = (uint16_t)dstPtr;
1434	1434
@@ -1543,7 +1543,7 @@ static int planarCopyWrapper(SwsContext c, const uint8_t src[], · 108 unmodified lines
1543	1543	} else {
1544	1544	if (is16BPS(c->srcFormat) && is16BPS(c->dstFormat))
1545	1545	length *= 2;
1546		− else if (!desc_src->comp[0].depth_minus1)
	1546	+ else if (desc_src->comp[0].depth == 1)
1547	1547	length >>= 3; // monowhite/black
1548	1548	for (i = 0; i < height; i++) {
1549	1549	memcpy(dstPtr, srcPtr, length);
@@ -1648,7 +1648,7 @@ void ff_get_unscaled_swscale(SwsContext *c) · 98 unmodified lines
1648	1648	dstFormat == AV_PIX_FMT_BGRA64LE \|\| dstFormat == AV_PIX_FMT_BGRA64BE))
1649	1649	c->swscale = planarRgb16ToRgb16Wrapper;
1650	1650
1651		− if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth_minus1 == 7 &&
	1651	+ if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth == 8 &&
1652	1652	isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP)
1653	1653	c->swscale = rgbToPlanarRgbWrapper;
1654	1654

libswscale/utils.c+2−2

@@ -1335,10 +1335,10 @@ av_cold int sws_init_context(SwsContext c, SwsFilter srcFilter, · 1334 unmodified lines
1335	1335
1336	1336	FF_ALLOCZ_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW2+78, 16) 2, fail);
1337	1337
1338		− c->srcBpc = 1 + desc_src->comp[0].depth_minus1;
	1338	+ c->srcBpc = desc_src->comp[0].depth;
1339	1339	if (c->srcBpc < 8)
1340	1340	c->srcBpc = 8;
1341		− c->dstBpc = 1 + desc_dst->comp[0].depth_minus1;
	1341	+ c->dstBpc = desc_dst->comp[0].depth;
1342	1342	if (c->dstBpc < 8)
1343	1343	c->dstBpc = 8;
1344	1344	if (isAnyRGB(srcFormat) \|\| srcFormat == AV_PIX_FMT_PAL8)

Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code