[FFmpeg-cvslog] avfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime

Michael Niedermayer git at videolan.org
Thu Aug 29 13:22:25 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 12:59:16 2013 +0200| [8b79a458c084632ef5d911cb135c52db59b402ff] | committer: Michael Niedermayer

avfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index c1ffc52..4eb3663 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -184,7 +184,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
             if (ret < 0)
                 return ret;
 
-            if (s->start_time != DBL_MAX) {
+            if (s->start_time != DBL_MAX && s->start_time != AV_NOPTS_VALUE) {
                 double first_pts = s->start_time * AV_TIME_BASE;
                 first_pts = FFMIN(FFMAX(first_pts, INT64_MIN), INT64_MAX);
                 s->first_pts = s->pts = av_rescale_q(first_pts, AV_TIME_BASE_Q,



More information about the ffmpeg-cvslog mailing list