[FFmpeg-cvslog] libavformat/utils: Fix misleading indent

Chris Miceli git at videolan.org
Tue Oct 20 17:28:12 EEST 2020


ffmpeg | branch: master | Chris Miceli <chris at miceli.net.au> | Tue Oct 13 15:59:06 2020 +1100| [be852803eb3b5628a45f91d298c924be038c2ff7] | committer: Michael Niedermayer

libavformat/utils: Fix misleading indent

6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 introduced this and it was part
of a very large merging of refactoring. Current behaviour is what is
reflected by this indenting change, however my understanding of timing
is such that this correct behaviour.

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index a2e701ea1a..e8335a601f 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1186,8 +1186,7 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st,
             pktl->pkt.dts = cur_dts;
             if (!st->internal->avctx->has_b_frames)
                 pktl->pkt.pts = cur_dts;
-//            if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO)
-                pktl->pkt.duration = duration;
+            pktl->pkt.duration = duration;
         } else
             break;
         cur_dts = pktl->pkt.dts + pktl->pkt.duration;



More information about the ffmpeg-cvslog mailing list