diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-24 17:46:16 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-18 16:57:03 +0200 |
| commit | e870255e4e3d7ed8ee15b9e205d922086af37eea (patch) | |
| tree | aac148d00f8e56274033ed3570549155fa520732 | |
| parent | c773ce32e1f0213117cb12534289c65954d26455 (diff) | |
| download | ffmpeg-e870255e4e3d7ed8ee15b9e205d922086af37eea.tar.gz | |
avformat/utils: fix mixed declarations and code
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 31de45d20b1ff90d4baf7c5a65e88f582efdb2a6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 8129528a85..eda9220923 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1711,10 +1711,10 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) if (next_pkt->dts != AV_NOPTS_VALUE) { int wrap_bits = s->streams[next_pkt->stream_index]->pts_wrap_bits; - av_assert2(wrap_bits <= 64); // last dts seen for this stream. if any of packets following // current one had no dts, we will set this to AV_NOPTS_VALUE. int64_t last_dts = next_pkt->dts; + av_assert2(wrap_bits <= 64); while (pktl && next_pkt->pts == AV_NOPTS_VALUE) { if (pktl->pkt.stream_index == next_pkt->stream_index && av_compare_mod(next_pkt->dts, pktl->pkt.dts, 2ULL << (wrap_bits - 1)) < 0) { |