Module: libav Branch: release/11 Commit: bc2468cc6969f709d57d2303a33dc0a59a4425a4
Author: Luca Barbato <[email protected]> Committer: Sean McGovern <[email protected]> Date: Mon Nov 28 20:52:47 2016 +0100 avconv: Fix the audio next dts computation Use the correct timebase. CC: [email protected] (cherry picked from commit d0c84c41d33ffd270d5f9fe0290e08341397fdee) Signed-off-by: Sean McGovern <[email protected]> Conflicts: avconv.c --- avconv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avconv.c b/avconv.c index 66148c0..f14a494 100644 --- a/avconv.c +++ b/avconv.c @@ -1176,7 +1176,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) /* if the decoder provides a pts, use it instead of the last packet pts. the decoder could be delaying output by a packet or more. */ if (decoded_frame->pts != AV_NOPTS_VALUE) - ist->next_dts = decoded_frame->pts; + ist->next_dts = av_rescale_q(decoded_frame->pts, ist->st->time_base, AV_TIME_BASE_Q); else if (pkt->pts != AV_NOPTS_VALUE) decoded_frame->pts = pkt->pts; pkt->pts = AV_NOPTS_VALUE; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
