summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2017-12-08 20:35:08 +0100
committerPaul B Mahol <onemda@gmail.com>2017-12-08 20:36:44 +0100
commit713f9c5b5d646c4be55b04d691bac21ecbd74089 (patch)
treeb0b6f31fa7554b5189d58b1b0c3cddd53fc87373
parentb404d41b1962d753ff3886fd82fffb9a16542a29 (diff)
avfilter/vf_scale: add more aliases for "range" options
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rw-r--r--doc/filters.texi4
-rw-r--r--libavfilter/vf_scale.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 0ec7d652a3..3346438231 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -13086,13 +13086,13 @@ a specific value used for the output and encoder. If not specified, the
range depends on the pixel format. Possible values:
@table @samp
-@item auto
+@item auto/unknown
Choose automatically.
@item jpeg/full/pc
Set full range (0-255 in case of 8-bit luma).
-@item mpeg/tv
+@item mpeg/limited/tv
Set "MPEG" range (16-235 in case of 8-bit luma).
@end table
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 2fd9c90d84..9f45032e85 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -578,7 +578,9 @@ static const AVOption scale_options[] = {
{ "in_range", "set input color range", OFFSET( in_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, 2, FLAGS, "range" },
{ "out_range", "set output color range", OFFSET(out_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, 2, FLAGS, "range" },
{ "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, 0, FLAGS, "range" },
+ { "unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, 0, FLAGS, "range" },
{ "full", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_JPEG}, 0, 0, FLAGS, "range" },
+ { "limited",NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG}, 0, 0, FLAGS, "range" },
{ "jpeg", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_JPEG}, 0, 0, FLAGS, "range" },
{ "mpeg", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG}, 0, 0, FLAGS, "range" },
{ "tv", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG}, 0, 0, FLAGS, "range" },