Commit 92b8c9d8 authored by Nicolas George's avatar Nicolas George

lavf/au: check bits per coded sample.

Without that, it would repeatedly produce empty packets
if the codec if forced to something invalid.

Fix trac ticket #1652.
parent 7f46f042
...@@ -181,10 +181,13 @@ static int au_read_packet(AVFormatContext *s, ...@@ -181,10 +181,13 @@ static int au_read_packet(AVFormatContext *s,
AVPacket *pkt) AVPacket *pkt)
{ {
int ret; int ret;
int bpcs = av_get_bits_per_sample(s->streams[0]->codec->codec_id);
if (!bpcs)
return AVERROR(EINVAL);
ret= av_get_packet(s->pb, pkt, BLOCK_SIZE * ret= av_get_packet(s->pb, pkt, BLOCK_SIZE *
s->streams[0]->codec->channels * s->streams[0]->codec->channels *
av_get_bits_per_sample(s->streams[0]->codec->codec_id) >> 3); bpcs >> 3);
if (ret < 0) if (ret < 0)
return ret; return ret;
pkt->flags &= ~AV_PKT_FLAG_CORRUPT; pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment