diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-03-26 12:02:47 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-03-26 13:23:41 +0000 |
| commit | 54056c6655c2025691127d9bfba6e6fca295aba5 (patch) | |
| tree | 148087b21421c7e82c77ecac4d134ef21dd54d46 /libavfilter/vsrc_testsrc.c | |
| parent | 7606f4a1af7dad70b5c44d3342f90d8392389d7b (diff) | |
lavfi/testsrc: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/vsrc_testsrc.c')
| -rw-r--r-- | libavfilter/vsrc_testsrc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index b650a61b40..bc0d3d16ab 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -52,7 +52,6 @@ typedef struct { unsigned int nb_frame; AVRational time_base, frame_rate; int64_t pts; - char *frame_rate_str; ///< video frame rate char *duration_str; ///< total duration of the generated video int64_t duration; ///< duration expressed in microseconds AVRational sar; ///< sample aspect ratio @@ -78,8 +77,8 @@ typedef struct { static const AVOption options[] = { { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "320x240"}, 0, 0, FLAGS }, { "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "320x240"}, 0, 0, FLAGS }, - { "rate", "set video rate", OFFSET(frame_rate_str), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS }, - { "r", "set video rate", OFFSET(frame_rate_str), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS }, + { "rate", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, FLAGS }, + { "r", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, FLAGS }, { "duration", "set video duration", OFFSET(duration_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, { "d", "set video duration", OFFSET(duration_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, { "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl= 1}, 0, INT_MAX, FLAGS }, @@ -104,11 +103,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args) if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0) return ret; - if ((ret = av_parse_video_rate(&test->frame_rate, test->frame_rate_str)) < 0) { - av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", test->frame_rate_str); - return ret; - } - test->duration = -1; if (test->duration_str && (ret = av_parse_time(&test->duration, test->duration_str, 1)) < 0) { |