diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-07-26 15:24:55 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-07-26 15:24:55 +0000 |
| commit | 7ac736afbd184e4ddf035e8e1a04361654b56f86 (patch) | |
| tree | 899231021a905050786aa069cd597fbe1512e761 /libavfilter/vf_frei0r.c | |
| parent | 2634af575c2de0da9b2f29b24c6fb3681d7040ff (diff) | |
| download | ffmpeg-7ac736afbd184e4ddf035e8e1a04361654b56f86.tar.gz | |
lavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/vf_frei0r.c')
| -rw-r--r-- | libavfilter/vf_frei0r.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 9a0ddd21e2..27d5a26918 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -68,7 +68,7 @@ typedef struct Frei0rContext { char *dl_name; char *params; char *size; - char *framerate; + AVRational framerate; /* only used by the source */ int w, h; @@ -455,19 +455,14 @@ AVFilter avfilter_vf_frei0r = { static av_cold int source_init(AVFilterContext *ctx) { Frei0rContext *s = ctx->priv; - AVRational frame_rate_q; if (av_parse_video_size(&s->w, &s->h, s->size) < 0) { av_log(ctx, AV_LOG_ERROR, "Invalid frame size: '%s'\n", s->size); return AVERROR(EINVAL); } - if (av_parse_video_rate(&frame_rate_q, s->framerate) < 0) { - av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", s->framerate); - return AVERROR(EINVAL); - } - s->time_base.num = frame_rate_q.den; - s->time_base.den = frame_rate_q.num; + s->time_base.num = s->framerate.den; + s->time_base.den = s->framerate.num; return frei0r_init(ctx, s->dl_name, F0R_PLUGIN_TYPE_SOURCE); } @@ -513,7 +508,7 @@ static int source_request_frame(AVFilterLink *outlink) static const AVOption frei0r_src_options[] = { { "size", "Dimensions of the generated video.", OFFSET(size), AV_OPT_TYPE_STRING, { .str = "" }, .flags = FLAGS }, - { "framerate", NULL, OFFSET(framerate), AV_OPT_TYPE_STRING, { .str = "25" }, .flags = FLAGS }, + { "framerate", NULL, OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, { .str = "25" }, .flags = FLAGS }, { "filter_name", NULL, OFFSET(dl_name), AV_OPT_TYPE_STRING, .flags = FLAGS }, { "filter_params", NULL, OFFSET(params), AV_OPT_TYPE_STRING, .flags = FLAGS }, { NULL }, |