[FFmpeg-cvslog] ffmpeg: remove unused and errorneous AVFrame timestamp check

[Hendrik Leppkes]

ffmpeg | branch: release/3.1 | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  1 16:15:45 2016 +0200| [263add4462a4f55496d7b322d71f5f72ab83178c] | committer: Michael Niedermayer

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.

(cherry picked from commit 04a3577263782cd6d70722d4ae18d75fee03dbc4)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=263add4462a4f55496d7b322d71f5f72ab83178c
---

 ffmpeg.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index b26995d..cdded86 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2026,12 +2026,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->pts != AV_NOPTS_VALUE) {