From 710cd0fddf39d4eea68f7dcdd3e98da179a4cd7b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 20 Mar 2013 17:49:20 +0100 Subject: avformat: Fix infinite probing that reads the whole file Fixes: otonajoshi_avformat_tries_to_load_whole.ts Reported-by: JEEB (on IRC) Thanks-to: nevcairiel Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 13de68a238..f9acc0e7f1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -771,6 +771,8 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) if (pktl) { *pkt = pktl->pkt; st = s->streams[pkt->stream_index]; + if (s->raw_packet_buffer_remaining_size <= 0) + probe_codec(s, st, NULL); if(st->request_probe <= 0){ s->raw_packet_buffer = pktl->next; s->raw_packet_buffer_remaining_size += pkt->size; -- cgit v1.2.3