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 'f62bb216ac4cfbbff16108c6bac35a0282532972'

Browse Source 
* commit 'f62bb216ac4cfbbff16108c6bac35a0282532972':
  hwcontext_vaapi: allow transfers to/from any size of sw frame

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2016-11-13 22:36:18 +01:00
parent 1f8e1c209d f62bb216ac
commit 3aa7b0a273
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/hwcontext_vaapi.c
View File

@@ -817,6 +817,9 @@ static int vaapi_transfer_data_from(AVHWFramesContext *hwfc,
AVFrame *map; AVFrame *map;
int err; int err;
if (dst->width > hwfc->width || dst->height > hwfc->height)
return AVERROR(EINVAL);
map = av_frame_alloc(); map = av_frame_alloc();
if (!map) if (!map)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -826,6 +829,9 @@ static int vaapi_transfer_data_from(AVHWFramesContext *hwfc,
if (err) if (err)
goto fail; goto fail;
map->width = dst->width;
map->height = dst->height;
err = av_frame_copy(dst, map); err = av_frame_copy(dst, map);
if (err) if (err)
goto fail; goto fail;
@@ -842,6 +848,9 @@ static int vaapi_transfer_data_to(AVHWFramesContext *hwfc,
AVFrame *map; AVFrame *map;
int err; int err;
if (src->width > hwfc->width || src->height > hwfc->height)
return AVERROR(EINVAL);
map = av_frame_alloc(); map = av_frame_alloc();
if (!map) if (!map)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -851,6 +860,9 @@ static int vaapi_transfer_data_to(AVHWFramesContext *hwfc,
if (err) if (err)
goto fail; goto fail;
map->width = src->width;
map->height = src->height;
err = av_frame_copy(map, src); err = av_frame_copy(map, src);
if (err) if (err)
goto fail; goto fail;