mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '4f3b058c84f570e261d743c7c22f865617fd28ac'
* commit '4f3b058c84f570e261d743c7c22f865617fd28ac': cavs: initialize various context tables to 0 mlpdec: do not try to allocate a zero-sized output buffer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9748cac565
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue