lavfi/testsrc: add "d" alias for the duration option

Stefano Sabatini committed 14 years ago

Commit a8b0ece1 parent 794006f3 files · +3 −2Browse files

Unified · Split

3 files

doc/filters.texi +1 −1
libavfilter/avfilter.h +1 −1
libavfilter/vsrc_testsrc.c +1 −0

doc/filters.texi+1−1

@@ -3230,7 +3230,7 @@ number or a valid video frame rate abbreviation. The default value is · 3229 unmodified lines
3230	@item sar	3230	@item sar
3231	Set the sample aspect ratio of the sourced video.	3231	Set the sample aspect ratio of the sourced video.
3232		3232
3233	@item duration	3233	@item duration, d
3234	Set the video duration of the sourced video. The accepted syntax is:	3234	Set the video duration of the sourced video. The accepted syntax is:
3235	@example	3235	@example
3236	[-]HH[:MM[:SS[.m...]]]	3236	[-]HH[:MM[:SS[.m...]]]

libavfilter/avfilter.h+1−1

@@ -31,7 +31,7 @@ · 30 unmodified lines
31		31
32	#define LIBAVFILTER_VERSION_MAJOR 2	32	#define LIBAVFILTER_VERSION_MAJOR 2
33	#define LIBAVFILTER_VERSION_MINOR 58	33	#define LIBAVFILTER_VERSION_MINOR 58
34	#define LIBAVFILTER_VERSION_MICRO 100	34	#define LIBAVFILTER_VERSION_MICRO 101
35		35
36	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \	36	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
37	LIBAVFILTER_VERSION_MINOR, \	37	LIBAVFILTER_VERSION_MINOR, \

libavfilter/vsrc_testsrc.c+1−0

@@ -62,6 +62,7 @@ static const AVOption testsrc_options[]= { · 61 unmodified lines
62	{ "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0 },	62	{ "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0 },
63	{ "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0 },	63	{ "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0 },
64	{ "duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0 },	64	{ "duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0 },
		65	{ "d", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0 },
65	{ "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl= 1}, 0, INT_MAX },	66	{ "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl= 1}, 0, INT_MAX },
66	{ NULL },	67	{ NULL },
67	};	68	};