Skip to content
Snippets Groups Projects
Commit fae545ca authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '19730794'


* commit '19730794':
  opusdec: make sure all substreams have the same number of coded samples

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 449bd3c0 19730794
No related branches found
No related tags found
No related merge requests found
...@@ -499,6 +499,12 @@ static int opus_decode_packet(AVCodecContext *avctx, void *data, ...@@ -499,6 +499,12 @@ static int opus_decode_packet(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "Error parsing the packet header.\n"); av_log(avctx, AV_LOG_ERROR, "Error parsing the packet header.\n");
return ret; return ret;
} }
if (coded_samples != s->packet.frame_count * s->packet.frame_duration) {
av_log(avctx, AV_LOG_ERROR,
"Mismatching coded sample count in substream %d.\n", i);
return AVERROR_INVALIDDATA;
}
s->silk_samplerate = get_silk_samplerate(s->packet.config); s->silk_samplerate = get_silk_samplerate(s->packet.config);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment