diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 01:07:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 01:07:59 +0200 |
| commit | 8202c49b43621c04e26d4a3aa83a10e1e5cc1836 (patch) | |
| tree | 243651489dccbe42987969b695578590d90cd137 | |
| parent | 12dddfed03470b3c8212a3a112312ce50eff4827 (diff) | |
| download | ffmpeg-8202c49b43621c04e26d4a3aa83a10e1e5cc1836.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>
| -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 be888d8526..140e254f36 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1634,7 +1634,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); |