[FFmpeg-cvslog] vf_fps: move initializing pts from config_props to init.

Anton Khirnov git at videolan.org
Fri May 17 11:11:32 CEST 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Mar 18 22:32:39 2013 +0100| [7727be79d1eeb24501459c49329ccad90161f459] | committer: Anton Khirnov

vf_fps: move initializing pts from config_props to init.

It should not be reinitialized if the link properties change.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7727be79d1eeb24501459c49329ccad90161f459
---

 libavfilter/vf_fps.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index eb201fa..7f51752 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -77,6 +77,8 @@ static av_cold int init(AVFilterContext *ctx)
     if (!(s->fifo = av_fifo_alloc(2*sizeof(AVFrame*))))
         return AVERROR(ENOMEM);
 
+    s->pts          = AV_NOPTS_VALUE;
+
     av_log(ctx, AV_LOG_VERBOSE, "fps=%d/%d\n", s->framerate.num, s->framerate.den);
     return 0;
 }
@@ -110,7 +112,6 @@ static int config_props(AVFilterLink* link)
     link->time_base = (AVRational){ s->framerate.den, s->framerate.num };
     link->w         = link->src->inputs[0]->w;
     link->h         = link->src->inputs[0]->h;
-    s->pts          = AV_NOPTS_VALUE;
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list