[FFmpeg-cvslog] avutil/pixdesc: Remove deprecated off-by-one fields from pix fmt descs
Andreas Rheinhardt
git at videolan.org
Wed Apr 28 00:16:20 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Mar 6 20:01:53 2021 +0100| [0181162bb54ce62ec212436a12d059726d8cd1df] | committer: James Almer
avutil/pixdesc: Remove deprecated off-by-one fields from pix fmt descs
Deprecated in 2268db2cd052674fde55c7d48b7a5098ce89b4ba.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0181162bb54ce62ec212436a12d059726d8cd1df
---
libavutil/pixdesc.c | 1056 +++++++++++++++++++++++++--------------------------
libavutil/pixdesc.h | 11 -
libavutil/version.h | 3 -
3 files changed, 525 insertions(+), 545 deletions(-)
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index a4ab93c975..e701005bc0 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -167,9 +167,6 @@ void av_write_image_line(const uint16_t *src,
av_write_image_line2(src, data, linesize, desc, x, y, c, w, 2);
}
-#if FF_API_PLUS1_MINUS1
-FF_DISABLE_DEPRECATION_WARNINGS
-#endif
static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_YUV420P] = {
.name = "yuv420p",
@@ -177,9 +174,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -189,9 +186,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* U */
- { 0, 4, 3, 0, 8, 3, 7, 4 }, /* V */
+ { 0, 2, 0, 0, 8 }, /* Y */
+ { 0, 4, 1, 0, 8 }, /* U */
+ { 0, 4, 3, 0, 8 }, /* V */
},
},
[AV_PIX_FMT_YVYU422] = {
@@ -200,9 +197,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
- { 0, 4, 3, 0, 8, 3, 7, 4 }, /* U */
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* V */
+ { 0, 2, 0, 0, 8 }, /* Y */
+ { 0, 4, 3, 0, 8 }, /* U */
+ { 0, 4, 1, 0, 8 }, /* V */
},
},
[AV_PIX_FMT_Y210LE] = {
@@ -211,9 +208,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 0, 6, 10, 3, 9, 1 }, /* Y */
- { 0, 8, 2, 6, 10, 7, 9, 3 }, /* U */
- { 0, 8, 6, 6, 10, 7, 9, 7 }, /* V */
+ { 0, 4, 0, 6, 10 }, /* Y */
+ { 0, 8, 2, 6, 10 }, /* U */
+ { 0, 8, 6, 6, 10 }, /* V */
},
},
[AV_PIX_FMT_Y210BE] = {
@@ -222,9 +219,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 0, 6, 10, 3, 9, 1 }, /* Y */
- { 0, 8, 2, 6, 10, 7, 9, 3 }, /* U */
- { 0, 8, 6, 6, 10, 7, 9, 7 }, /* V */
+ { 0, 4, 0, 6, 10 }, /* Y */
+ { 0, 8, 2, 6, 10 }, /* U */
+ { 0, 8, 6, 6, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE,
},
@@ -234,9 +231,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 3, 0, 0, 8, 2, 7, 1 }, /* R */
- { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */
- { 0, 3, 2, 0, 8, 2, 7, 3 }, /* B */
+ { 0, 3, 0, 0, 8 }, /* R */
+ { 0, 3, 1, 0, 8 }, /* G */
+ { 0, 3, 2, 0, 8 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -246,9 +243,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 3, 2, 0, 8, 2, 7, 3 }, /* R */
- { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */
- { 0, 3, 0, 0, 8, 2, 7, 1 }, /* B */
+ { 0, 3, 2, 0, 8 }, /* R */
+ { 0, 3, 1, 0, 8 }, /* G */
+ { 0, 3, 0, 0, 8 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -258,9 +255,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
- { 0, 4, 2, 4, 10, 3, 9, 2 }, /* R */
- { 0, 4, 1, 2, 10, 3, 9, 3 }, /* G */
- { 0, 4, 0, 0, 10, 3, 9, 4 }, /* B */
+ { 0, 4, 2, 4, 10 }, /* R */
+ { 0, 4, 1, 2, 10 }, /* G */
+ { 0, 4, 0, 0, 10 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -270,9 +267,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
- { 0, 4, 0, 4, 10, 3, 9, 2 }, /* R */
- { 0, 4, 1, 2, 10, 3, 9, 3 }, /* G */
- { 0, 4, 2, 0, 10, 3, 9, 4 }, /* B */
+ { 0, 4, 0, 4, 10 }, /* R */
+ { 0, 4, 1, 2, 10 }, /* G */
+ { 0, 4, 2, 0, 10 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE,
},
@@ -282,9 +279,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -294,9 +291,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -306,9 +303,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 2,
.log2_chroma_h = 2,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -318,9 +315,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 2,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -330,9 +327,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 2,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -342,7 +339,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
+ { 0, 1, 0, 0, 8 }, /* Y */
},
.flags = FF_PSEUDOPAL,
.alias = "gray8,y8",
@@ -353,7 +350,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 1, 0, 0, 1 }, /* Y */
+ { 0, 1, 0, 0, 1 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BITSTREAM,
},
@@ -363,7 +360,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 7, 1, 0, 0, 1 }, /* Y */
+ { 0, 1, 0, 7, 1 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BITSTREAM,
},
@@ -373,7 +370,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 },
+ { 0, 1, 0, 0, 8 },
},
.flags = AV_PIX_FMT_FLAG_PAL | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -383,9 +380,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -395,9 +392,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -407,9 +404,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -423,9 +420,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 1, 0, 8, 1, 7, 2 }, /* Y */
- { 0, 4, 0, 0, 8, 3, 7, 1 }, /* U */
- { 0, 4, 2, 0, 8, 3, 7, 3 }, /* V */
+ { 0, 2, 1, 0, 8 }, /* Y */
+ { 0, 4, 0, 0, 8 }, /* U */
+ { 0, 4, 2, 0, 8 }, /* V */
},
},
[AV_PIX_FMT_UYYVYY411] = {
@@ -434,9 +431,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 2,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* Y */
- { 0, 6, 0, 0, 8, 5, 7, 1 }, /* U */
- { 0, 6, 3, 0, 8, 5, 7, 4 }, /* V */
+ { 0, 4, 1, 0, 8 }, /* Y */
+ { 0, 6, 0, 0, 8 }, /* U */
+ { 0, 6, 3, 0, 8 }, /* V */
},
},
[AV_PIX_FMT_BGR8] = {
@@ -445,9 +442,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 3, 0, 2, 1 }, /* R */
- { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */
- { 0, 1, 0, 6, 2, 0, 1, 1 }, /* B */
+ { 0, 1, 0, 0, 3 }, /* R */
+ { 0, 1, 0, 3, 3 }, /* G */
+ { 0, 1, 0, 6, 2 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL,
},
@@ -457,9 +454,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 3, 0, 1, 3, 0, 4 }, /* R */
- { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */
- { 0, 4, 0, 0, 1, 3, 0, 1 }, /* B */
+ { 0, 4, 3, 0, 1 }, /* R */
+ { 0, 4, 1, 0, 2 }, /* G */
+ { 0, 4, 0, 0, 1 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,
},
@@ -469,9 +466,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 1, 0, 0, 1 }, /* R */
- { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */
- { 0, 1, 0, 3, 1, 0, 0, 1 }, /* B */
+ { 0, 1, 0, 0, 1 }, /* R */
+ { 0, 1, 0, 1, 2 }, /* G */
+ { 0, 1, 0, 3, 1 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL,
},
@@ -481,9 +478,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 6, 2, 0, 1, 1 }, /* R */
- { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */
- { 0, 1, 0, 0, 3, 0, 2, 1 }, /* B */
+ { 0, 1, 0, 6, 2 }, /* R */
+ { 0, 1, 0, 3, 3 }, /* G */
+ { 0, 1, 0, 0, 3 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL,
},
@@ -493,9 +490,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 0, 0, 1, 3, 0, 1 }, /* R */
- { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */
- { 0, 4, 3, 0, 1, 3, 0, 4 }, /* B */
+ { 0, 4, 0, 0, 1 }, /* R */
+ { 0, 4, 1, 0, 2 }, /* G */
+ { 0, 4, 3, 0, 1 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,
},
@@ -505,9 +502,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 3, 1, 0, 0, 1 }, /* R */
- { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */
- { 0, 1, 0, 0, 1, 0, 0, 1 }, /* B */
+ { 0, 1, 0, 3, 1 }, /* R */
+ { 0, 1, 0, 1, 2 }, /* G */
+ { 0, 1, 0, 0, 1 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL,
},
@@ -517,9 +514,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */
- { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 2, 0, 0, 8 }, /* U */
+ { 1, 2, 1, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -529,9 +526,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 2, 1, 0, 8, 1, 7, 2 }, /* U */
- { 1, 2, 0, 0, 8, 1, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 2, 1, 0, 8 }, /* U */
+ { 1, 2, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -541,10 +538,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */
- { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
- { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */
- { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */
+ { 0, 4, 1, 0, 8 }, /* R */
+ { 0, 4, 2, 0, 8 }, /* G */
+ { 0, 4, 3, 0, 8 }, /* B */
+ { 0, 4, 0, 0, 8 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -554,10 +551,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
- { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */
- { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */
+ { 0, 4, 0, 0, 8 }, /* R */
+ { 0, 4, 1, 0, 8 }, /* G */
+ { 0, 4, 2, 0, 8 }, /* B */
+ { 0, 4, 3, 0, 8 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -567,10 +564,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */
- { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */
- { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */
+ { 0, 4, 3, 0, 8 }, /* R */
+ { 0, 4, 2, 0, 8 }, /* G */
+ { 0, 4, 1, 0, 8 }, /* B */
+ { 0, 4, 0, 0, 8 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -580,10 +577,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
- { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */
- { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */
+ { 0, 4, 2, 0, 8 }, /* R */
+ { 0, 4, 1, 0, 8 }, /* G */
+ { 0, 4, 0, 0, 8 }, /* B */
+ { 0, 4, 3, 0, 8 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -593,9 +590,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */
- { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
- { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */
+ { 0, 4, 1, 0, 8 }, /* R */
+ { 0, 4, 2, 0, 8 }, /* G */
+ { 0, 4, 3, 0, 8 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -605,9 +602,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
- { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
- { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */
+ { 0, 4, 0, 0, 8 }, /* R */
+ { 0, 4, 1, 0, 8 }, /* G */
+ { 0, 4, 2, 0, 8 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -617,9 +614,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
- { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */
- { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */
+ { 0, 4, 3, 0, 8 }, /* R */
+ { 0, 4, 2, 0, 8 }, /* G */
+ { 0, 4, 1, 0, 8 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -629,9 +626,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
- { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */
- { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
- { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */
+ { 0, 4, 2, 0, 8 }, /* R */
+ { 0, 4, 1, 0, 8 }, /* G */
+ { 0, 4, 0, 0, 8 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -641,7 +638,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
+ { 0, 2, 0, 0, 9 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BE,
.alias = "y9be",
@@ -652,7 +649,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
+ { 0, 2, 0, 0, 9 }, /* Y */
},
.alias = "y9le",
},
@@ -662,7 +659,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
+ { 0, 2, 0, 0, 10 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BE,
.alias = "y10be",
@@ -673,7 +670,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
+ { 0, 2, 0, 0, 10 }, /* Y */
},
.alias = "y10le",
},
@@ -683,7 +680,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 0, 2, 0, 0, 12 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BE,
.alias = "y12be",
@@ -694,7 +691,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 0, 2, 0, 0, 12 }, /* Y */
},
.alias = "y12le",
},
@@ -704,7 +701,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
+ { 0, 2, 0, 0, 14 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BE,
.alias = "y14be",
@@ -715,7 +712,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
+ { 0, 2, 0, 0, 14 }, /* Y */
},
.alias = "y14le",
},
@@ -725,7 +722,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
+ { 0, 2, 0, 0, 16 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BE,
.alias = "y16be",
@@ -736,7 +733,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
+ { 0, 2, 0, 0, 16 }, /* Y */
},
.alias = "y16le",
},
@@ -746,9 +743,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -758,9 +755,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -770,9 +767,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -782,9 +779,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -794,9 +791,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -806,9 +803,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -818,10 +815,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
- { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
+ { 3, 1, 0, 0, 8 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -831,10 +828,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
- { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
+ { 3, 1, 0, 0, 8 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -844,10 +841,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
- { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 1, 0, 0, 8 }, /* U */
+ { 2, 1, 0, 0, 8 }, /* V */
+ { 3, 1, 0, 0, 8 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -857,10 +854,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
- { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
+ { 3, 2, 0, 0, 9 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -870,10 +867,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
- { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
+ { 3, 2, 0, 0, 9 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -883,10 +880,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
- { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
+ { 3, 2, 0, 0, 9 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -896,10 +893,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
- { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
+ { 3, 2, 0, 0, 9 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -909,10 +906,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
- { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
+ { 3, 2, 0, 0, 9 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -922,10 +919,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
- { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
+ { 3, 2, 0, 0, 9 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -935,10 +932,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
- { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
+ { 3, 2, 0, 0, 10 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -948,10 +945,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
- { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
+ { 3, 2, 0, 0, 10 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -961,10 +958,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
- { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
+ { 3, 2, 0, 0, 10 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -974,10 +971,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
- { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
+ { 3, 2, 0, 0, 10 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -987,10 +984,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
- { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
+ { 3, 2, 0, 0, 10 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1000,10 +997,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
- { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
+ { 3, 2, 0, 0, 10 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1013,10 +1010,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
- { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
+ { 3, 2, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1026,10 +1023,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
- { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
+ { 3, 2, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1039,10 +1036,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
- { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
+ { 3, 2, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1052,10 +1049,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
- { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
+ { 3, 2, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1065,10 +1062,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
- { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
+ { 3, 2, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1078,10 +1075,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
- { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
+ { 3, 2, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1091,9 +1088,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */
- { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
- { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */
+ { 0, 6, 0, 0, 16 }, /* R */
+ { 0, 6, 2, 0, 16 }, /* G */
+ { 0, 6, 4, 0, 16 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE,
},
@@ -1103,9 +1100,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */
- { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
- { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */
+ { 0, 6, 0, 0, 16 }, /* R */
+ { 0, 6, 2, 0, 16 }, /* G */
+ { 0, 6, 4, 0, 16 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -1115,10 +1112,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */
- { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
- { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */
- { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
+ { 0, 8, 0, 0, 16 }, /* R */
+ { 0, 8, 2, 0, 16 }, /* G */
+ { 0, 8, 4, 0, 16 }, /* B */
+ { 0, 8, 6, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1128,10 +1125,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */
- { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
- { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */
- { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
+ { 0, 8, 0, 0, 16 }, /* R */
+ { 0, 8, 2, 0, 16 }, /* G */
+ { 0, 8, 4, 0, 16 }, /* B */
+ { 0, 8, 6, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1141,9 +1138,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, -1, 3, 5, 1, 4, 0 }, /* R */
- { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
- { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
+ { 0, 2, -1, 3, 5 }, /* R */
+ { 0, 2, 0, 5, 6 }, /* G */
+ { 0, 2, 0, 0, 5 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1153,9 +1150,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 1, 3, 5, 1, 4, 2 }, /* R */
- { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
- { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
+ { 0, 2, 1, 3, 5 }, /* R */
+ { 0, 2, 0, 5, 6 }, /* G */
+ { 0, 2, 0, 0, 5 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -1165,9 +1162,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, -1, 2, 5, 1, 4, 0 }, /* R */
- { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
- { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
+ { 0, 2, -1, 2, 5 }, /* R */
+ { 0, 2, 0, 5, 5 }, /* G */
+ { 0, 2, 0, 0, 5 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1177,9 +1174,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 1, 2, 5, 1, 4, 2 }, /* R */
- { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
- { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
+ { 0, 2, 1, 2, 5 }, /* R */
+ { 0, 2, 0, 5, 5 }, /* G */
+ { 0, 2, 0, 0, 5 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -1189,9 +1186,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, -1, 0, 4, 1, 3, 0 }, /* R */
- { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
- { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */
+ { 0, 2, -1, 0, 4 }, /* R */
+ { 0, 2, 0, 4, 4 }, /* G */
+ { 0, 2, 0, 0, 4 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1201,9 +1198,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 1, 0, 4, 1, 3, 2 }, /* R */
- { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
- { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */
+ { 0, 2, 1, 0, 4 }, /* R */
+ { 0, 2, 0, 4, 4 }, /* G */
+ { 0, 2, 0, 0, 4 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -1213,9 +1210,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
- { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
- { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
+ { 0, 6, 4, 0, 16 }, /* R */
+ { 0, 6, 2, 0, 16 }, /* G */
+ { 0, 6, 0, 0, 16 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1225,9 +1222,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
- { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
- { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
+ { 0, 6, 4, 0, 16 }, /* R */
+ { 0, 6, 2, 0, 16 }, /* G */
+ { 0, 6, 0, 0, 16 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -1237,10 +1234,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */
- { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
- { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */
- { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
+ { 0, 8, 4, 0, 16 }, /* R */
+ { 0, 8, 2, 0, 16 }, /* G */
+ { 0, 8, 0, 0, 16 }, /* B */
+ { 0, 8, 6, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1250,10 +1247,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */
- { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
- { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */
- { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
+ { 0, 8, 4, 0, 16 }, /* R */
+ { 0, 8, 2, 0, 16 }, /* G */
+ { 0, 8, 0, 0, 16 }, /* B */
+ { 0, 8, 6, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1263,9 +1260,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
- { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
- { 0, 2, -1, 3, 5, 1, 4, 0 }, /* B */
+ { 0, 2, 0, 0, 5 }, /* R */
+ { 0, 2, 0, 5, 6 }, /* G */
+ { 0, 2, -1, 3, 5 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1275,9 +1272,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
- { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
- { 0, 2, 1, 3, 5, 1, 4, 2 }, /* B */
+ { 0, 2, 0, 0, 5 }, /* R */
+ { 0, 2, 0, 5, 6 }, /* G */
+ { 0, 2, 1, 3, 5 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -1287,9 +1284,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
- { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
- { 0, 2, -1, 2, 5, 1, 4, 0 }, /* B */
+ { 0, 2, 0, 0, 5 }, /* R */
+ { 0, 2, 0, 5, 5 }, /* G */
+ { 0, 2, -1, 2, 5 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1299,9 +1296,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
- { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
- { 0, 2, 1, 2, 5, 1, 4, 2 }, /* B */
+ { 0, 2, 0, 0, 5 }, /* R */
+ { 0, 2, 0, 5, 5 }, /* G */
+ { 0, 2, 1, 2, 5 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -1311,9 +1308,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */
- { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
- { 0, 2, -1, 0, 4, 1, 3, 0 }, /* B */
+ { 0, 2, 0, 0, 4 }, /* R */
+ { 0, 2, 0, 4, 4 }, /* G */
+ { 0, 2, -1, 0, 4 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1323,9 +1320,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */
- { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
- { 0, 2, 1, 0, 4, 1, 3, 2 }, /* B */
+ { 0, 2, 0, 0, 4 }, /* R */
+ { 0, 2, 0, 4, 4 }, /* G */
+ { 0, 2, 1, 0, 4 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -1341,9 +1338,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1353,9 +1350,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1365,9 +1362,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1377,9 +1374,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1389,9 +1386,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1401,9 +1398,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1413,9 +1410,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
- { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
- { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
+ { 0, 2, 0, 0, 14 }, /* Y */
+ { 1, 2, 0, 0, 14 }, /* U */
+ { 2, 2, 0, 0, 14 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1425,9 +1422,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
- { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
- { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
+ { 0, 2, 0, 0, 14 }, /* Y */
+ { 1, 2, 0, 0, 14 }, /* U */
+ { 2, 2, 0, 0, 14 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1437,9 +1434,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1449,9 +1446,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1461,9 +1458,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1473,9 +1470,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1485,9 +1482,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1497,9 +1494,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1509,9 +1506,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1521,9 +1518,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1533,9 +1530,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
- { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
- { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
+ { 0, 2, 0, 0, 14 }, /* Y */
+ { 1, 2, 0, 0, 14 }, /* U */
+ { 2, 2, 0, 0, 14 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1545,9 +1542,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
- { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
- { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
+ { 0, 2, 0, 0, 14 }, /* Y */
+ { 1, 2, 0, 0, 14 }, /* U */
+ { 2, 2, 0, 0, 14 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1557,9 +1554,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1569,9 +1566,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1581,9 +1578,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1593,9 +1590,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 2, 0, 0, 16 }, /* U */
+ { 2, 2, 0, 0, 16 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1605,9 +1602,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1617,9 +1614,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 2, 0, 0, 10 }, /* U */
+ { 2, 2, 0, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1629,9 +1626,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1641,9 +1638,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
+ { 0, 2, 0, 0, 9 }, /* Y */
+ { 1, 2, 0, 0, 9 }, /* U */
+ { 2, 2, 0, 0, 9 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1653,9 +1650,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1665,9 +1662,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1677,9 +1674,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
- { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
- { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
+ { 0, 2, 0, 0, 14 }, /* Y */
+ { 1, 2, 0, 0, 14 }, /* U */
+ { 2, 2, 0, 0, 14 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1689,9 +1686,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
- { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
- { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
+ { 0, 2, 0, 0, 14 }, /* Y */
+ { 1, 2, 0, 0, 14 }, /* U */
+ { 2, 2, 0, 0, 14 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1711,8 +1708,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.name = "ya8",
.nb_components = 2,
.comp = {
- { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
- { 0, 2, 1, 0, 8, 1, 7, 2 }, /* A */
+ { 0, 2, 0, 0, 8 }, /* Y */
+ { 0, 2, 1, 0, 8 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_ALPHA,
.alias = "gray8a",
@@ -1721,8 +1718,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.name = "ya16le",
.nb_components = 2,
.comp = {
- { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */
- { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */
+ { 0, 4, 0, 0, 16 }, /* Y */
+ { 0, 4, 2, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1730,8 +1727,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.name = "ya16be",
.nb_components = 2,
.comp = {
- { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */
- { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */
+ { 0, 4, 0, 0, 16 }, /* Y */
+ { 0, 4, 2, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1745,9 +1742,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */
+ { 2, 1, 0, 0, 8 }, /* R */
+ { 0, 1, 0, 0, 8 }, /* G */
+ { 1, 1, 0, 0, 8 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1757,9 +1754,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */
+ { 2, 2, 0, 0, 9 }, /* R */
+ { 0, 2, 0, 0, 9 }, /* G */
+ { 1, 2, 0, 0, 9 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1769,9 +1766,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */
- { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */
- { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */
+ { 2, 2, 0, 0, 9 }, /* R */
+ { 0, 2, 0, 0, 9 }, /* G */
+ { 1, 2, 0, 0, 9 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1781,9 +1778,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
+ { 2, 2, 0, 0, 10 }, /* R */
+ { 0, 2, 0, 0, 10 }, /* G */
+ { 1, 2, 0, 0, 10 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1793,9 +1790,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
+ { 2, 2, 0, 0, 10 }, /* R */
+ { 0, 2, 0, 0, 10 }, /* G */
+ { 1, 2, 0, 0, 10 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1805,9 +1802,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
+ { 2, 2, 0, 0, 12 }, /* R */
+ { 0, 2, 0, 0, 12 }, /* G */
+ { 1, 2, 0, 0, 12 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1817,9 +1814,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
+ { 2, 2, 0, 0, 12 }, /* R */
+ { 0, 2, 0, 0, 12 }, /* G */
+ { 1, 2, 0, 0, 12 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1829,9 +1826,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */
- { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */
+ { 2, 2, 0, 0, 14 }, /* R */
+ { 0, 2, 0, 0, 14 }, /* G */
+ { 1, 2, 0, 0, 14 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1841,9 +1838,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */
- { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */
- { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */
+ { 2, 2, 0, 0, 14 }, /* R */
+ { 0, 2, 0, 0, 14 }, /* G */
+ { 1, 2, 0, 0, 14 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1853,9 +1850,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
+ { 2, 2, 0, 0, 16 }, /* R */
+ { 0, 2, 0, 0, 16 }, /* G */
+ { 1, 2, 0, 0, 16 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1865,9 +1862,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
+ { 2, 2, 0, 0, 16 }, /* R */
+ { 0, 2, 0, 0, 16 }, /* G */
+ { 1, 2, 0, 0, 16 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1877,10 +1874,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */
- { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */
- { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
+ { 2, 1, 0, 0, 8 }, /* R */
+ { 0, 1, 0, 0, 8 }, /* G */
+ { 1, 1, 0, 0, 8 }, /* B */
+ { 3, 1, 0, 0, 8 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |
AV_PIX_FMT_FLAG_ALPHA,
@@ -1891,10 +1888,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
- { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
+ { 2, 2, 0, 0, 16 }, /* R */
+ { 0, 2, 0, 0, 16 }, /* G */
+ { 1, 2, 0, 0, 16 }, /* B */
+ { 3, 2, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |
AV_PIX_FMT_FLAG_ALPHA,
@@ -1905,10 +1902,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
- { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
- { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
+ { 2, 2, 0, 0, 16 }, /* R */
+ { 0, 2, 0, 0, 16 }, /* G */
+ { 1, 2, 0, 0, 16 }, /* B */
+ { 3, 2, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR |
AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
@@ -1925,9 +1922,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */
- { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */
- { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */
+ { 0, 6, 0, 4, 12 }, /* X */
+ { 0, 6, 2, 4, 12 }, /* Y */
+ { 0, 6, 4, 4, 12 }, /* Z */
},
/*.flags = -- not used*/
},
@@ -1937,9 +1934,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */
- { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */
- { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */
+ { 0, 6, 0, 4, 12 }, /* X */
+ { 0, 6, 2, 4, 12 }, /* Y */
+ { 0, 6, 4, 4, 12 }, /* Z */
},
.flags = AV_PIX_FMT_FLAG_BE,
},
@@ -1949,9 +1946,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0, \
.log2_chroma_h= 0, \
.comp = { \
- {0,1,0,0,2,0,1,1},\
- {0,1,0,0,4,0,3,1},\
- {0,1,0,0,2,0,1,1},\
+ { 0, 1, 0, 0, 2 }, \
+ { 0, 1, 0, 0, 4 }, \
+ { 0, 1, 0, 0, 2 }, \
}, \
#define BAYER16_DESC_COMMON \
@@ -1959,9 +1956,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0, \
.log2_chroma_h= 0, \
.comp = { \
- {0,2,0,0,4,1,3,1},\
- {0,2,0,0,8,1,7,1},\
- {0,2,0,0,4,1,3,1},\
+ { 0, 2, 0, 0, 4 }, \
+ { 0, 2, 0, 0, 8 }, \
+ { 0, 2, 0, 0, 4 }, \
}, \
[AV_PIX_FMT_BAYER_BGGR8] = {
@@ -2030,9 +2027,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */
- { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 2, 0, 0, 8 }, /* U */
+ { 1, 2, 1, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -2042,9 +2039,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */
- { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 4, 0, 0, 10 }, /* U */
+ { 1, 4, 2, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -2054,9 +2051,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
- { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */
- { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */
+ { 0, 2, 0, 0, 10 }, /* Y */
+ { 1, 4, 0, 0, 10 }, /* U */
+ { 1, 4, 2, 0, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE,
},
@@ -2082,10 +2079,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */
- { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */
- { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */
- { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */
+ { 0, 8, 2, 0, 16 }, /* Y */
+ { 0, 8, 4, 0, 16 }, /* U */
+ { 0, 8, 6, 0, 16 }, /* V */
+ { 0, 8, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_ALPHA,
},
@@ -2095,10 +2092,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */
- { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */
- { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */
- { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */
+ { 0, 8, 2, 0, 16 }, /* Y */
+ { 0, 8, 4, 0, 16 }, /* U */
+ { 0, 8, 6, 0, 16 }, /* V */
+ { 0, 8, 0, 0, 16 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -2108,9 +2105,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 6, 10, 1, 9, 1 }, /* Y */
- { 1, 4, 0, 6, 10, 3, 9, 1 }, /* U */
- { 1, 4, 2, 6, 10, 3, 9, 3 }, /* V */
+ { 0, 2, 0, 6, 10 }, /* Y */
+ { 1, 4, 0, 6, 10 }, /* U */
+ { 1, 4, 2, 6, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -2120,9 +2117,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 6, 10, 1, 9, 1 }, /* Y */
- { 1, 4, 0, 6, 10, 3, 9, 1 }, /* U */
- { 1, 4, 2, 6, 10, 3, 9, 3 }, /* V */
+ { 0, 2, 0, 6, 10 }, /* Y */
+ { 1, 4, 0, 6, 10 }, /* U */
+ { 1, 4, 2, 6, 10 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE,
},
@@ -2132,9 +2129,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 4, 0, 0, 16, 3, 15, 1 }, /* U */
- { 1, 4, 2, 0, 16, 3, 15, 3 }, /* V */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 4, 0, 0, 16 }, /* U */
+ { 1, 4, 2, 0, 16 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -2144,9 +2141,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
- { 1, 4, 0, 0, 16, 3, 15, 1 }, /* U */
- { 1, 4, 2, 0, 16, 3, 15, 3 }, /* V */
+ { 0, 2, 0, 0, 16 }, /* Y */
+ { 1, 4, 0, 0, 16 }, /* U */
+ { 1, 4, 2, 0, 16 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE,
},
@@ -2156,10 +2153,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
- { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */
+ { 2, 2, 0, 0, 12 }, /* R */
+ { 0, 2, 0, 0, 12 }, /* G */
+ { 1, 2, 0, 0, 12 }, /* B */
+ { 3, 2, 0, 0, 12 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |
AV_PIX_FMT_FLAG_ALPHA,
@@ -2170,10 +2167,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
- { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */
+ { 2, 2, 0, 0, 12 }, /* R */
+ { 0, 2, 0, 0, 12 }, /* G */
+ { 1, 2, 0, 0, 12 }, /* B */
+ { 3, 2, 0, 0, 12 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR |
AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
@@ -2184,10 +2181,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
- { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
+ { 2, 2, 0, 0, 10 }, /* R */
+ { 0, 2, 0, 0, 10 }, /* G */
+ { 1, 2, 0, 0, 10 }, /* B */
+ { 3, 2, 0, 0, 10 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |
AV_PIX_FMT_FLAG_ALPHA,
@@ -2198,10 +2195,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
- { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
- { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
- { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
+ { 2, 2, 0, 0, 10 }, /* R */
+ { 0, 2, 0, 0, 10 }, /* G */
+ { 1, 2, 0, 0, 10 }, /* B */
+ { 3, 2, 0, 0, 10 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR |
AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
@@ -2216,9 +2213,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 4, 0, 0, 32, 3, 31, 1 }, /* R */
- { 0, 4, 0, 0, 32, 3, 31, 1 }, /* G */
- { 1, 4, 0, 0, 32, 3, 31, 1 }, /* B */
+ { 2, 4, 0, 0, 32 }, /* R */
+ { 0, 4, 0, 0, 32 }, /* G */
+ { 1, 4, 0, 0, 32 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR |
AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_FLOAT,
@@ -2229,9 +2226,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 4, 0, 0, 32, 3, 31, 1 }, /* R */
- { 0, 4, 0, 0, 32, 3, 31, 1 }, /* G */
- { 1, 4, 0, 0, 32, 3, 31, 1 }, /* B */
+ { 2, 4, 0, 0, 32 }, /* R */
+ { 0, 4, 0, 0, 32 }, /* G */
+ { 1, 4, 0, 0, 32 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_FLOAT | AV_PIX_FMT_FLAG_RGB,
},
@@ -2241,10 +2238,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 4, 0, 0, 32, 3, 31, 1 }, /* R */
- { 0, 4, 0, 0, 32, 3, 31, 1 }, /* G */
- { 1, 4, 0, 0, 32, 3, 31, 1 }, /* B */
- { 3, 4, 0, 0, 32, 3, 31, 1 }, /* A */
+ { 2, 4, 0, 0, 32 }, /* R */
+ { 0, 4, 0, 0, 32 }, /* G */
+ { 1, 4, 0, 0, 32 }, /* B */
+ { 3, 4, 0, 0, 32 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR |
AV_PIX_FMT_FLAG_ALPHA | AV_PIX_FMT_FLAG_RGB |
@@ -2256,10 +2253,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 4, 0, 0, 32, 3, 31, 1 }, /* R */
- { 0, 4, 0, 0, 32, 3, 31, 1 }, /* G */
- { 1, 4, 0, 0, 32, 3, 31, 1 }, /* B */
- { 3, 4, 0, 0, 32, 3, 31, 1 }, /* A */
+ { 2, 4, 0, 0, 32 }, /* R */
+ { 0, 4, 0, 0, 32 }, /* G */
+ { 1, 4, 0, 0, 32 }, /* B */
+ { 3, 4, 0, 0, 32 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA |
AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_FLOAT,
@@ -2278,7 +2275,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 0, 0, 32, 3, 31, 1 }, /* Y */
+ { 0, 4, 0, 0, 32 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_FLOAT,
.alias = "yf32be",
@@ -2289,7 +2286,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 4, 0, 0, 32, 3, 31, 1 }, /* Y */
+ { 0, 4, 0, 0, 32 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_FLOAT,
.alias = "yf32le",
@@ -2300,10 +2297,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
- { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
+ { 3, 2, 0, 0, 12 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -2313,10 +2310,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
- { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
+ { 3, 2, 0, 0, 12 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -2326,10 +2323,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
- { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
+ { 3, 2, 0, 0, 12 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -2339,10 +2336,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
- { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
- { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
- { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */
+ { 0, 2, 0, 0, 12 }, /* Y */
+ { 1, 2, 0, 0, 12 }, /* U */
+ { 2, 2, 0, 0, 12 }, /* V */
+ { 3, 2, 0, 0, 12 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -2352,9 +2349,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */
- { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 2, 0, 0, 8 }, /* U */
+ { 1, 2, 1, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -2364,9 +2361,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
- { 1, 2, 1, 0, 8, 1, 7, 2 }, /* U */
- { 1, 2, 0, 0, 8, 1, 7, 1 }, /* V */
+ { 0, 1, 0, 0, 8 }, /* Y */
+ { 1, 2, 1, 0, 8 }, /* U */
+ { 1, 2, 0, 0, 8 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -2375,9 +2372,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.flags = AV_PIX_FMT_FLAG_HWACCEL,
},
};
-#if FF_API_PLUS1_MINUS1
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
static const char * const color_range_names[] = {
[AVCOL_RANGE_UNSPECIFIED] = "unknown",
diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index 9b9d386ae9..81b51b767f 100644
--- a/libavutil/pixdesc.h
+++ b/libavutil/pixdesc.h
@@ -56,17 +56,6 @@ typedef struct AVComponentDescriptor {
* Number of bits in the component.
*/
int depth;
-
-#if FF_API_PLUS1_MINUS1
- /** deprecated, use step instead */
- attribute_deprecated int step_minus1;
-
- /** deprecated, use depth instead */
- attribute_deprecated int depth_minus1;
-
- /** deprecated, use offset instead */
- attribute_deprecated int offset_plus1;
-#endif
} AVComponentDescriptor;
/**
diff --git a/libavutil/version.h b/libavutil/version.h
index a4648d12c2..e15bdf40ad 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -105,9 +105,6 @@
* @{
*/
-#ifndef FF_API_PLUS1_MINUS1
-#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57)
-#endif
#ifndef FF_API_ERROR_FRAME
#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
More information about the ffmpeg-cvslog
mailing list