]> git.sesse.net Git - ffmpeg/commitdiff
af_aresample: consistently use ROUNDED_DIV
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 19:17:16 +0000 (20:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 20:09:15 +0000 (21:09 +0100)
This fixes issues with negative timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_aresample.c

index 9218689d7d73016e67c174be8df2c5cca15f6a27..0f5f09161e5053d8ac64edce5703b657fac67680 100644 (file)
@@ -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);