From 8780f7fbfaacb1f31d9915a368850f23557bc0d5 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 9 Oct 2013 16:24:00 +0200 Subject: avfilter/ff_filter_frame_needs_framing: fix handling of AV_NOPTS_VALUE Fixes Ticket3015 Signed-off-by: Michael Niedermayer --- libavfilter/avfilter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b5b3734944..7ce82f8011 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1092,8 +1092,9 @@ static int ff_filter_frame_needs_framing(AVFilterLink *link, AVFrame *frame) return 0; } av_frame_copy_props(pbuf, frame); - pbuf->pts = frame->pts + - av_rescale_q(inpos, samples_tb, link->time_base); + pbuf->pts = frame->pts; + if (pbuf->pts != AV_NOPTS_VALUE) + pbuf->pts += av_rescale_q(inpos, samples_tb, link->time_base); pbuf->nb_samples = 0; } nb_samples = FFMIN(insamples, -- cgit v1.2.3