ffmpeg | branch: release/3.3 | James Almer <jamr...@gmail.com> | Fri Nov 24 17:46:16 2017 -0300| [3e3704da0c71d5254b986300f610b0f0217f2023] | committer: Michael Niedermayer
avformat/utils: fix mixed declarations and code Signed-off-by: James Almer <jamr...@gmail.com> (cherry picked from commit 31de45d20b1ff90d4baf7c5a65e88f582efdb2a6) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e3704da0c71d5254b986300f610b0f0217f2023 --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 2053c3f755..0749151ee3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1732,10 +1732,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) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
