virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'c8e135ea9225137050a6315fd9ba9c0f242c90b6'

Browse Source 
* commit 'c8e135ea9225137050a6315fd9ba9c0f242c90b6':
  vaapi_encode: Allocate slice structures and parameter buffers dynamically

Already present as e4a6eb70f4, one minor
fix for libav merged.

Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Mark Thompson
2018-02-21 21:46:09 +00:00
parent d09368a408 c8e135ea92
commit fe1fb48e2b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/vaapi_encode.c
View File

@@ -321,10 +321,12 @@ static int vaapi_encode_issue(AVCodecContext *avctx,
} }
} }
pic->slices = av_mallocz_array(pic->nb_slices, sizeof(*pic->slices)); if (pic->nb_slices > 0) {
if (!pic->slices) { pic->slices = av_mallocz_array(pic->nb_slices, sizeof(*pic->slices));
err = AVERROR(ENOMEM); if (!pic->slices) {
goto fail; err = AVERROR(ENOMEM);
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];