RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 12:56:56 +00:00
Code Issues Projects Releases Wiki Activity

Determine VOC block length when length field is zero, fixes issue1538.

Browse Source 
Originally committed as revision 20596 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross 2009-11-24 07:08:17 +00:00
parent d90aeeaf56
commit c351524c9e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/voc.h
View File

@ -26,7 +26,7 @@
#include "riff.h" /* for CodecTag */ #include "riff.h" /* for CodecTag */
typedef struct voc_dec_context { typedef struct voc_dec_context {
int remaining_size; int64_t remaining_size;
} VocDecContext; } VocDecContext;
typedef enum voc_type { typedef enum voc_type {

5
libavformat/vocdec.c
View File

@ -76,6 +76,11 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
if (type == VOC_TYPE_EOF) if (type == VOC_TYPE_EOF)
return AVERROR(EIO); return AVERROR(EIO);
voc->remaining_size = get_le24(pb); voc->remaining_size = get_le24(pb);
if (!voc->remaining_size) {
if (url_is_streamed(s->pb))
return AVERROR(EIO);
voc->remaining_size = url_fsize(pb) - url_ftell(pb);
}
max_size -= 4; max_size -= 4;
switch (type) { switch (type) {