diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 14:16:36 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 14:16:36 +0300 |
commit | 6f74e3cde6147b9a9bda5071e505e9ffbb99096a (patch) | |
tree | dda765f307f2c19b3af909b35e82b42236c58d46 /ffmpeg.c | |
parent | 3f9137c57d2344d7613f134128235c18edcede95 (diff) | |
parent | beb62dac629603eb074a44c44389c230b5caac7c (diff) |
Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c'
* commit 'beb62dac629603eb074a44c44389c230b5caac7c':
Use AVFrame.pts instead of deprecated pkt_pts.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -2108,8 +2108,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) } } - if (decoded_frame->pkt_pts != AV_NOPTS_VALUE) { - decoded_frame->pts = decoded_frame->pkt_pts; + if (decoded_frame->pts != AV_NOPTS_VALUE) { decoded_frame_tb = ist->st->time_base; } else if (pkt && pkt->pts != AV_NOPTS_VALUE) { decoded_frame->pts = pkt->pts; |