Commit 5c612c5f authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit 'e18ba2df'

* commit 'e18ba2df':
  hwcontext_dxva2: make sure the sw frame format is the right one during transfer
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 0f9ce9c5 e18ba2df
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment