Commit 9748cac5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4f3b058c'

* commit '4f3b058c':
  cavs: initialize various context tables to 0
  mlpdec: do not try to allocate a zero-sized output buffer.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 663ebae7 4f3b058c
......@@ -1016,6 +1016,11 @@ static int output_data(MLPDecodeContext *m, unsigned int substr,
return AVERROR_INVALIDDATA;
}
if (!s->blockpos) {
av_log(avctx, AV_LOG_ERROR, "No samples to output.\n");
return AVERROR_INVALIDDATA;
}
/* get output buffer */
frame->nb_samples = s->blockpos;
if ((ret = ff_get_buffer(avctx, frame)) < 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