Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'

* commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31': lavf: do not use the parser duration for video Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 8064c6ac5f
parent 3bf189bb00 f9157463db
commit 8064c6ac5f
1 changed files with 0 additions and 6 deletions
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@ -1360,12 +1360,6 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, int stream_index)
                                     st->time_base,
                                     AV_ROUND_DOWN);
            }
-        } else if (st->codec->time_base.num != 0 &&
-                   st->codec->time_base.den != 0) {
-            out_pkt.duration = av_rescale_q_rnd(st->parser->duration,
-                                                st->codec->time_base,
-                                                st->time_base,
-                                                AV_ROUND_DOWN);
        }

        out_pkt.stream_index = st->index;