diff mbox series

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

Message ID 20201013045906.197610-1-chris@miceli.net.au
State Accepted
Commit be852803eb3b5628a45f91d298c924be038c2ff7
Headers show
Series [FFmpeg-devel] libavformat/utils: Fix misleading indent | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make warning Make failed

Commit Message

Chris Miceli Oct. 13, 2020, 4:59 a.m. UTC 
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.
---
 libavformat/utils.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Michael Niedermayer Oct. 20, 2020, 1:38 p.m. UTC | #1 
On Tue, Oct 13, 2020 at 03:59:06PM +1100, Chris Miceli wrote:
> 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.
> ---
>  libavformat/utils.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

will apply

thx

[...]
diff mbox series

Patch

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;