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:15:57 +0200 |
| commit | c285db74f6477a09b7ebaa8c526d2a0d9c94a498 (patch) | |
| tree | bc7a26fc1ccf1f2d6446ed4dec175e2f535fa8d0 | |
| parent | cc8d20e345e231543888a07e4063303758285307 (diff) | |
| download | ffmpeg-c285db74f6477a09b7ebaa8c526d2a0d9c94a498.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 d32f584197..9dd403f9f8 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1533,7 +1533,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); |