diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 01:07:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-14 23:26:06 +0200 |
| commit | 9752ab6b9e5d3b9f2347361b6b951911fecee022 (patch) | |
| tree | e9a1e8e5e16f9a5bdbc98e01f7bc421338c0b466 | |
| parent | 64e069efac2937891b7e5a6d16677f1122afcc8b (diff) | |
| download | ffmpeg-9752ab6b9e5d3b9f2347361b6b951911fecee022.tar.gz | |
avformat/utils: do not wait for packets from discarded streams for genpts
Fixes long loop
Fixes Ticket3208
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8202c49b43621c04e26d4a3aa83a10e1e5cc1836)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 27b37b22e1..4dc1d9c25b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1597,7 +1597,8 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) } /* read packet from packet buffer, if there is data */ - if (!(next_pkt->pts == AV_NOPTS_VALUE && + st = s->streams[next_pkt->stream_index]; + if (!(next_pkt->pts == AV_NOPTS_VALUE && st->discard < AVDISCARD_ALL && next_pkt->dts != AV_NOPTS_VALUE && !eof)) { ret = read_from_packet_buffer(&s->packet_buffer, &s->packet_buffer_end, pkt); |