[FFmpeg-cvslog] lavfi/testsrc: add "d" alias for the duration option

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Tue Jan 10 11:04:59 2012 +0100| [a8b0ece6e59e9fd354cc426ea6ffab39352df3f5] | committer: Stefano Sabatini

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8b0ece6e59e9fd354cc426ea6ffab39352df3f5
---

 doc/filters.texi           |    2 +-
 libavfilter/avfilter.h     |    2 +-
 libavfilter/vsrc_testsrc.c |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index d0075f2..99e157d 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.
 
- at item duration
+ at 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 9c79597..1746907 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 1383550..310f8c8 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 },
 };