Commit 9790a03e authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mxfdec: check sample size more completely

Fixes division by zero
Fixes Ticket2992
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent e064d0aa
...@@ -2195,7 +2195,9 @@ static int mxf_set_audio_pts(MXFContext *mxf, AVCodecContext *codec, AVPacket *p ...@@ -2195,7 +2195,9 @@ static int mxf_set_audio_pts(MXFContext *mxf, AVCodecContext *codec, AVPacket *p
{ {
MXFTrack *track = mxf->fc->streams[pkt->stream_index]->priv_data; MXFTrack *track = mxf->fc->streams[pkt->stream_index]->priv_data;
pkt->pts = track->sample_count; pkt->pts = track->sample_count;
if (codec->channels <= 0 || av_get_bits_per_sample(codec->codec_id) <= 0) if ( codec->channels <= 0
|| av_get_bits_per_sample(codec->codec_id) <= 0
|| codec->channels * (int64_t)av_get_bits_per_sample(codec->codec_id) < 8)
return AVERROR(EINVAL); return AVERROR(EINVAL);
track->sample_count += pkt->size / (codec->channels * (int64_t)av_get_bits_per_sample(codec->codec_id) / 8); track->sample_count += pkt->size / (codec->channels * (int64_t)av_get_bits_per_sample(codec->codec_id) / 8);
return 0; return 0;
......
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