diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 17:49:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 17:57:00 +0100 |
| commit | 710cd0fddf39d4eea68f7dcdd3e98da179a4cd7b (patch) | |
| tree | 03f00354f3b69b3b750fadb1cbc1177bb1597283 | |
| parent | 06a43baecd2c21c1c27d9c8fdd199ce27be028ec (diff) | |
| download | ffmpeg-710cd0fddf39d4eea68f7dcdd3e98da179a4cd7b.tar.gz | |
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@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |