Commit 38893dc0 authored by Anton Khirnov's avatar Anton Khirnov

pcmdec: replace a reachable assert with an error check

Libavformat should not make any assumptions about values returned from
other libraries. This assert is easily reachable by using a non-raw
codec id.
parent cca4742a
...@@ -74,7 +74,11 @@ static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -74,7 +74,11 @@ static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id); bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
assert(bps); // if false there IS a bug elsewhere (NOT in this function) if (!bps) {
av_log(s, AV_LOG_ERROR, "Unknown number of bytes per sample.\n");
return AVERROR(EINVAL);
}
pkt->dts= pkt->dts=
pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels); pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
......
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