[FFmpeg-cvslog] avformat/utils: fix mixed declarations and code

James Almer git at videolan.org
Thu Jul 19 00:27:59 EEST 2018


ffmpeg | branch: release/3.2 | James Almer <jamrial at gmail.com> | Fri Nov 24 17:46:16 2017 -0300| [e870255e4e3d7ed8ee15b9e205d922086af37eea] | committer: Michael Niedermayer

avformat/utils: fix mixed declarations and code

Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 31de45d20b1ff90d4baf7c5a65e88f582efdb2a6)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) {



More information about the ffmpeg-cvslog mailing list