Merge commit 'c8e135ea9225137050a6315fd9ba9c0f242c90b6'
* commit 'c8e135ea9225137050a6315fd9ba9c0f242c90b6': vaapi_encode: Allocate slice structures and parameter buffers dynamically Already present as e4a6eb70f471eda36592078e8fa1bad87fc9df73, one minor fix for libav merged. Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
commit
fe1fb48e2b
@ -321,11 +321,13 @@ static int vaapi_encode_issue(AVCodecContext *avctx,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pic->nb_slices > 0) {
|
||||||
pic->slices = av_mallocz_array(pic->nb_slices, sizeof(*pic->slices));
|
pic->slices = av_mallocz_array(pic->nb_slices, sizeof(*pic->slices));
|
||||||
if (!pic->slices) {
|
if (!pic->slices) {
|
||||||
err = AVERROR(ENOMEM);
|
err = AVERROR(ENOMEM);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
for (i = 0; i < pic->nb_slices; i++) {
|
for (i = 0; i < pic->nb_slices; i++) {
|
||||||
slice = &pic->slices[i];
|
slice = &pic->slices[i];
|
||||||
slice->index = i;
|
slice->index = i;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user