[FFmpeg-cvslog] avformat: Fix infinite probing that reads the whole file

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 20 17:49:20 2013 +0100| [710cd0fddf39d4eea68f7dcdd3e98da179a4cd7b] | committer: Michael Niedermayer

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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=710cd0fddf39d4eea68f7dcdd3e98da179a4cd7b
---

 libavformat/utils.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 13de68a..f9acc0e 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;