summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-10-01 16:15:45 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2016-10-07 12:21:18 +0200
commit04a3577263782cd6d70722d4ae18d75fee03dbc4 (patch)
tree87b5ecff4317a253d37a31ecb74579f2c00684e9 /ffmpeg.c
parent021286720248e9753d8cf4626a55e329e21708aa (diff)
ffmpeg: remove unused and errorneous AVFrame timestamp check
Decoders have previously not used AVFrame.pts, and with the upcoming deprecation of pkt_pts (in favor of pts), this would lead to an errorneous interpration of timestamps.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 44371f0bc2..6748ad83ed 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2108,12 +2108,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->dts = ist->next_dts = ist->pts = ist->next_pts = av_rescale_q(decoded_frame->pts, avctx->time_base, AV_TIME_BASE_Q);
- decoded_frame_tb = avctx->time_base;
- } else if (decoded_frame->pkt_pts != AV_NOPTS_VALUE) {
+ if (decoded_frame->pkt_pts != AV_NOPTS_VALUE) {
decoded_frame->pts = decoded_frame->pkt_pts;
decoded_frame_tb = ist->st->time_base;
} else if (pkt && pkt->pts != AV_NOPTS_VALUE) {