videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

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.
This commit is contained in:
Anton Khirnov 2014-02-10 07:41:21 +01:00
parent cca4742a5e
commit 38893dc028
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/pcmdec.c
View File

@ -74,7 +74,11 @@ static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
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->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);