[FFmpeg-cvslog] avformat/utils: do not wait for packets from discarded streams for genpts
Michael Niedermayer
git at videolan.org
Fri Nov 14 19:28:30 CET 2014
ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 13 01:07:59 2014 +0200| [dd72df9845d0687d03be6a5b830c8ed84edaa907] | committer: Michael Niedermayer
avformat/utils: do not wait for packets from discarded streams for genpts
Fixes long loop
Fixes Ticket3208
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8202c49b43621c04e26d4a3aa83a10e1e5cc1836)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd72df9845d0687d03be6a5b830c8ed84edaa907
---
libavformat/utils.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index a010f29..3280a0d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1440,7 +1440,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);
More information about the ffmpeg-cvslog
mailing list