avfilter/vf_mergeplanes: deprecate mapping option

Paul B Mahol committed 4 years ago

Commit 854615a1 parent 385bc751 file · +1 −1Browse files

Unified · Split

libavfilter/vf_mergeplanes.c+1−1

@@ -56,7 +56,7 @@ typedef struct MergePlanesContext { · 55 unmodified lines
56	56	#define OFFSET(x) offsetof(MergePlanesContext, x)
57	57	#define FLAGS AV_OPT_FLAG_FILTERING_PARAM\|AV_OPT_FLAG_VIDEO_PARAM
58	58	static const AVOption mergeplanes_options[] = {
59		− { "mapping", "set input to output plane mapping", OFFSET(mapping), AV_OPT_TYPE_INT, {.i64=-1}, -1, 0x33333333, FLAGS },
	59	+ { "mapping", "set input to output plane mapping", OFFSET(mapping), AV_OPT_TYPE_INT, {.i64=-1}, -1, 0x33333333, FLAGS\|AV_OPT_FLAG_DEPRECATED },
60	60	{ "format", "set output pixel format", OFFSET(out_fmt), AV_OPT_TYPE_PIXEL_FMT, {.i64=AV_PIX_FMT_YUVA444P}, 0, INT_MAX, .flags=FLAGS },
61	61	{ "map0s", "set 1st input to output stream mapping", OFFSET(map[0].input), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, FLAGS },
62	62	{ "map0p", "set 1st input to output plane mapping", OFFSET(map[0].plane), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, FLAGS },