diff options
Diffstat (limited to 'ffmpeg/libavformat/idroqdec.c')
| -rw-r--r-- | ffmpeg/libavformat/idroqdec.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ffmpeg/libavformat/idroqdec.c b/ffmpeg/libavformat/idroqdec.c index 6f843d7..8cdd72e 100644 --- a/ffmpeg/libavformat/idroqdec.c +++ b/ffmpeg/libavformat/idroqdec.c @@ -145,6 +145,8 @@ static int roq_read_packet(AVFormatContext *s, break; case RoQ_QUAD_CODEBOOK: + if (roq->video_stream_index < 0) + return AVERROR_INVALIDDATA; /* packet needs to contain both this codebook and next VQ chunk */ codebook_offset = avio_tell(pb) - RoQ_CHUNK_PREAMBLE_SIZE; codebook_size = chunk_size; @@ -194,6 +196,11 @@ static int roq_read_packet(AVFormatContext *s, st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; } case RoQ_QUAD_VQ: + if (chunk_type == RoQ_QUAD_VQ) { + if (roq->video_stream_index < 0) + return AVERROR_INVALIDDATA; + } + /* load up the packet */ if (av_new_packet(pkt, chunk_size + RoQ_CHUNK_PREAMBLE_SIZE)) return AVERROR(EIO); |