RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423' 

* commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423':
  hwcontext_dxva2: make sure the sw frame format is the right one during transfer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2017-04-01 18:53:40 +02:00
parent 0f9ce9c5fc e18ba2dfd2
commit 5c612c5ff8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/hwcontext_dxva2.c
View File

@ -331,6 +331,9 @@ static int dxva2_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
AVFrame *map;
int ret;
if (src->format != ctx->sw_format)
return AVERROR(ENOSYS);
map = av_frame_alloc();
if (!map)
return AVERROR(ENOMEM);
@ -355,6 +358,9 @@ static int dxva2_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
ptrdiff_t src_linesize[4], dst_linesize[4];
int ret, i;
if (dst->format != ctx->sw_format)
return AVERROR(ENOSYS);
map = av_frame_alloc();
if (!map)
return AVERROR(ENOMEM);