diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-01-10 11:04:59 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-01-12 10:39:24 +0100 |
| commit | a8b0ece6e59e9fd354cc426ea6ffab39352df3f5 (patch) | |
| tree | 9c41176efd370023f16f5224253fe2e2e6f6140e | |
| parent | 794006f8fe403ccd2993513a8e4fbe885ef7f9fb (diff) | |
| download | ffmpeg-a8b0ece6e59e9fd354cc426ea6ffab39352df3f5.tar.gz | |
lavfi/testsrc: add "d" alias for the duration option
| -rw-r--r-- | doc/filters.texi | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/vsrc_testsrc.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index d0075f2453..99e157d54c 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3230,7 +3230,7 @@ number or a valid video frame rate abbreviation. The default value is @item sar Set the sample aspect ratio of the sourced video. -@item duration +@item duration, d Set the video duration of the sourced video. The accepted syntax is: @example [-]HH[:MM[:SS[.m...]]] diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 9c795978aa..1746907273 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MINOR 58 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 1383550e91..310f8c8bf3 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -62,6 +62,7 @@ static const AVOption testsrc_options[]= { { "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0 }, { "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0 }, { "duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0 }, + { "d", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0 }, { "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl= 1}, 0, INT_MAX }, { NULL }, }; |