diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 13:56:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 13:56:29 +0200 |
| commit | 8064c6ac5fe97b77f833d988be9a9b3192b2f4a8 (patch) | |
| tree | 72404d9aea52669b08c4d4c797779af0c7b43e4e /libavformat/utils.c | |
| parent | 3bf189bb00863a6ffc88e2a4770ccc6106551a96 (diff) | |
| parent | f9157463dbcd2db8fe9504197c0c04d0d7d04f31 (diff) | |
| download | ffmpeg-8064c6ac5fe97b77f833d988be9a9b3192b2f4a8.tar.gz | |
Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'
* commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31':
lavf: do not use the parser duration for video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 3122257b96..06d92dcf25 100644 --- 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; |