From 61fb67dcb2e71a268c422fc19d366040e59fb337 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Tue, 3 Nov 2015 09:57:19 -0800 Subject: buffersrc: accept the frame rate as argument. (cherry picked from ffmpeg commit 9ca440679dc535b31edd569393d8d3dda59db90e) Signed-off-by: Anton Khirnov --- libavfilter/buffersrc.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavfilter') 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; } -- cgit v1.2.3