diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2015-11-03 09:57:19 -0800 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-11-09 08:09:41 +0100 |
| commit | 61fb67dcb2e71a268c422fc19d366040e59fb337 (patch) | |
| tree | a7e2774361a1115453b52c828d45f0f42ee14f21 /libavfilter/buffersrc.c | |
| parent | 48ff6683ba5d40b629428673b1028e8ec542a9fa (diff) | |
| download | ffmpeg-61fb67dcb2e71a268c422fc19d366040e59fb337.tar.gz | |
buffersrc: accept the frame rate as argument.
(cherry picked from ffmpeg commit 9ca440679dc535b31edd569393d8d3dda59db90e)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavfilter/buffersrc.c')
| -rw-r--r-- | libavfilter/buffersrc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index a9b893c1aa..f5b852f8cf 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -44,6 +44,7 @@ typedef struct BufferSourceContext { const AVClass *class; AVFifoBuffer *fifo; AVRational time_base; ///< time_base to set in the output link + AVRational frame_rate; ///< frame_rate to set in the output link /* video only */ int h, w; @@ -191,6 +192,7 @@ static const AVOption video_options[] = { #endif { "sar", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 1 }, 0, DBL_MAX, V }, { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, + { "frame_rate", NULL, OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { NULL }, }; @@ -308,6 +310,7 @@ static int config_props(AVFilterLink *link) } link->time_base = c->time_base; + link->frame_rate = c->frame_rate; return 0; } |