[03/11] vf_fps: set frame_rate.

Message ID 1446050900-7329-3-git-send-email-stebbins@jetheaddev.com
State New
Headers show

Commit Message

John Stebbins Oct. 28, 2015, 4:48 p.m.
From: Nicolas George <nicolas.george@normalesup.org>

(cherry picked from ffmpeg commit 0d249316043fb69a3972029bff3a2969689ba8b6)
---
 libavfilter/vf_fps.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Anton Khirnov Oct. 29, 2015, 6:50 p.m. | #1
Quoting John Stebbins (2015-10-28 17:48:19)
> From: Nicolas George <nicolas.george@normalesup.org>
> 
> (cherry picked from ffmpeg commit 0d249316043fb69a3972029bff3a2969689ba8b6)
> ---
>  libavfilter/vf_fps.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
> index ea22d37..e20f5a0 100644
> --- a/libavfilter/vf_fps.c
> +++ b/libavfilter/vf_fps.c
> @@ -117,6 +117,7 @@ static int config_props(AVFilterLink* link)
>      FPSContext   *s = link->src->priv;
>  
>      link->time_base = (AVRational){ s->framerate.den, s->framerate.num };
> +    link->frame_rate= s->framerate;

nit: missing space (I can add it on push, just mentioning here for
completeness)

Otherwise ok.

Patch

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index ea22d37..e20f5a0 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -117,6 +117,7 @@  static int config_props(AVFilterLink* link)
     FPSContext   *s = link->src->priv;
 
     link->time_base = (AVRational){ s->framerate.den, s->framerate.num };
+    link->frame_rate= s->framerate;
     link->w         = link->src->inputs[0]->w;
     link->h         = link->src->inputs[0]->h;