Commit 1ae8198b authored by Anton Khirnov's avatar Anton Khirnov

avconv: always reset packet pts after decoding an audio frame

Currently, if a decoder sets AVFrame.pts, we'd send the same timestamp
to it twice, which is wrong.
parent b19a5e51
......@@ -1175,10 +1175,9 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
the decoder could be delaying output by a packet or more. */
if (decoded_frame->pts != AV_NOPTS_VALUE)
ist->next_dts = decoded_frame->pts;
else if (pkt->pts != AV_NOPTS_VALUE) {
else if (pkt->pts != AV_NOPTS_VALUE)
decoded_frame->pts = pkt->pts;
pkt->pts = AV_NOPTS_VALUE;
}
pkt->pts = AV_NOPTS_VALUE;
resample_changed = ist->resample_sample_fmt != decoded_frame->format ||
ist->resample_channels != avctx->channels ||
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment