From: Niklas Haas <[email protected]>
---
libavfilter/vf_scale.c | 48 +++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index d4236f4b6c..77697f3f6a 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -1091,34 +1091,34 @@ static const AVOption scale_options[] = {
{ "s", "set video size", OFFSET(size_str),
AV_OPT_TYPE_STRING, {.str = NULL}, 0, .flags = FLAGS },
{ "in_color_matrix", "set input YCbCr type", OFFSET(in_color_matrix),
AV_OPT_TYPE_INT, { .i64 = -1 }, -1, AVCOL_SPC_NB-1, .flags = FLAGS, .unit =
"color" },
{ "out_color_matrix", "set output YCbCr type", OFFSET(out_color_matrix),
AV_OPT_TYPE_INT, { .i64 = AVCOL_SPC_UNSPECIFIED }, 0, AVCOL_SPC_NB-1, .flags =
FLAGS, .unit = "color"},
- { "auto", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = -1 },
0, 0, FLAGS, .unit = "color" },
- { "bt601", NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
AVCOL_SPC_BT470BG }, 0, 0, FLAGS, .unit = "color" },
- { "bt470", NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
AVCOL_SPC_BT470BG }, 0, 0, FLAGS, .unit = "color" },
- { "smpte170m", NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
AVCOL_SPC_BT470BG }, 0, 0, FLAGS, .unit = "color" },
- { "bt709", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVCOL_SPC_BT709
}, 0, 0, FLAGS, .unit = "color" },
- { "fcc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVCOL_SPC_FCC },
0, 0, FLAGS, .unit = "color" },
- { "smpte240m", NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
AVCOL_SPC_SMPTE240M }, 0, 0, FLAGS, .unit = "color" },
- { "bt2020", NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
AVCOL_SPC_BT2020_NCL }, 0, 0, FLAGS, .unit = "color" },
+ { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64=-1},
0, 0, FLAGS, .unit = "color" },
+ { "bt601", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_BT470BG},
0, 0, FLAGS, .unit = "color" },
+ { "bt470", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_BT470BG},
0, 0, FLAGS, .unit = "color" },
+ { "smpte170m", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_BT470BG},
0, 0, FLAGS, .unit = "color" },
+ { "bt709", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_BT709},
0, 0, FLAGS, .unit = "color" },
+ { "fcc", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_FCC},
0, 0, FLAGS, .unit = "color" },
+ { "smpte240m", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_SPC_SMPTE240M}, 0, 0, FLAGS, .unit = "color" },
+ { "bt2020", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_SPC_BT2020_NCL}, 0, 0, FLAGS, .unit = "color" },
{ "in_range", "set input color range", OFFSET( in_range),
AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, 2, FLAGS, .unit =
"range" },
{ "out_range", "set output color range", OFFSET(out_range),
AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, 2, FLAGS, .unit =
"range" },
- { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_UNSPECIFIED },
0, 0, FLAGS, .unit = "range" },
- { "unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_UNSPECIFIED
}, 0, 0, FLAGS, .unit = "range" },
- { "full", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_JPEG}, 0, 0,
FLAGS, .unit = "range" },
- { "limited",NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG}, 0, 0,
FLAGS, .unit = "range" },
- { "jpeg", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_JPEG}, 0, 0,
FLAGS, .unit = "range" },
- { "mpeg", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG}, 0, 0,
FLAGS, .unit = "range" },
- { "tv", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG}, 0, 0,
FLAGS, .unit = "range" },
- { "pc", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_JPEG}, 0, 0,
FLAGS, .unit = "range" },
+ { "auto", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_RANGE_UNSPECIFIED }, 0, 0, FLAGS, .unit = "range" },
+ { "unknown", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_RANGE_UNSPECIFIED }, 0, 0, FLAGS, .unit = "range" },
+ { "full", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_JPEG},
0, 0, FLAGS, .unit = "range" },
+ { "limited", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_MPEG},
0, 0, FLAGS, .unit = "range" },
+ { "jpeg", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_JPEG},
0, 0, FLAGS, .unit = "range" },
+ { "mpeg", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_MPEG},
0, 0, FLAGS, .unit = "range" },
+ { "tv", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_MPEG},
0, 0, FLAGS, .unit = "range" },
+ { "pc", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_JPEG},
0, 0, FLAGS, .unit = "range" },
{ "in_chroma_loc", "set input chroma sample location",
OFFSET(in_chroma_loc), AV_OPT_TYPE_INT, { .i64 = AVCHROMA_LOC_UNSPECIFIED },
0, AVCHROMA_LOC_NB-1, .flags = FLAGS, .unit = "chroma_loc" },
{ "out_chroma_loc", "set output chroma sample location",
OFFSET(out_chroma_loc), AV_OPT_TYPE_INT, { .i64 = AVCHROMA_LOC_UNSPECIFIED },
0, AVCHROMA_LOC_NB-1, .flags = FLAGS, .unit = "chroma_loc" },
- {"auto", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_UNSPECIFIED}, 0, 0, FLAGS, .unit = "chroma_loc"},
- {"unknown", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_UNSPECIFIED}, 0, 0, FLAGS, .unit = "chroma_loc"},
- {"left", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_LEFT}, 0, 0, FLAGS, .unit = "chroma_loc"},
- {"center", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_CENTER}, 0, 0, FLAGS, .unit = "chroma_loc"},
- {"topleft", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_TOPLEFT}, 0, 0, FLAGS, .unit = "chroma_loc"},
- {"top", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_TOP},
0, 0, FLAGS, .unit = "chroma_loc"},
- {"bottomleft", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_BOTTOMLEFT}, 0, 0, FLAGS, .unit = "chroma_loc"},
- {"bottom", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_BOTTOM}, 0, 0, FLAGS, .unit = "chroma_loc"},
+ {"auto", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_UNSPECIFIED}, 0, 0, FLAGS, .unit = "chroma_loc"},
+ {"unknown", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_UNSPECIFIED}, 0, 0, FLAGS, .unit = "chroma_loc"},
+ {"left", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_LEFT},
0, 0, FLAGS, .unit = "chroma_loc"},
+ {"center", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_CENTER}, 0, 0, FLAGS, .unit = "chroma_loc"},
+ {"topleft", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_TOPLEFT}, 0, 0, FLAGS, .unit = "chroma_loc"},
+ {"top", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_TOP},
0, 0, FLAGS, .unit = "chroma_loc"},
+ {"bottomleft", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_BOTTOMLEFT}, 0, 0, FLAGS, .unit = "chroma_loc"},
+ {"bottom", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCHROMA_LOC_BOTTOM}, 0, 0, FLAGS, .unit = "chroma_loc"},
{ "in_primaries", "set input primaries", OFFSET(in_primaries),
AV_OPT_TYPE_INT, { .i64 = -1 }, -1, AVCOL_PRI_NB-1, .flags = FLAGS, .unit =
"primaries" },
{ "out_primaries", "set output primaries", OFFSET(out_primaries),
AV_OPT_TYPE_INT, { .i64 = -1 }, -1, AVCOL_PRI_NB-1, .flags = FLAGS, .unit =
"primaries"},
{"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64=-1},
0, 0, FLAGS, .unit = "primaries"},
--
2.47.0
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
