From 8d231e37af0cfd7dd52bdea57d144f2c663664ae Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 26 Nov 2012 20:17:16 +0100 Subject: af_aresample: consistently use ROUNDED_DIV This fixes issues with negative timestamps Signed-off-by: Michael Niedermayer --- libavfilter/af_aresample.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavfilter/af_aresample.c') diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index 9218689d7d..0f5f09161e 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -243,7 +243,8 @@ static int request_frame(AVFilterLink *outlink) if(aresample->next_pts != AV_NOPTS_VALUE) aresample->next_pts += av_rescale_q(n_out, (AVRational){1 ,outlink->sample_rate}, outlink->time_base); #else - outsamplesref->pts = (swr_next_pts(aresample->swr, INT64_MIN) + inlink->sample_rate/2) / inlink->sample_rate; + outsamplesref->pts = swr_next_pts(aresample->swr, INT64_MIN); + outsamplesref->pts = ROUNDED_DIV(outsamplesref->pts, inlink->sample_rate); #endif ff_filter_samples(outlink, outsamplesref); -- cgit v1.2.3