Merge commit '0d3176e32f351d18d6174d8b05796829a75a4c6b'

* commit '0d3176e32f351d18d6174d8b05796829a75a4c6b':
  hwcontext_dxva2: do not assume the destination format during mapping is always the right one

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/258/head
Hendrik Leppkes 8 years ago
commit d91e7aac12
  1. 4
      libavutil/hwcontext_dxva2.c

@ -361,6 +361,10 @@ static int dxva2_map_from(AVHWFramesContext *ctx,
{
int err;
if (dst->format != AV_PIX_FMT_NONE && dst->format != ctx->sw_format)
return AVERROR(ENOSYS);
dst->format = ctx->sw_format;
err = dxva2_map_frame(ctx, dst, src, flags);
if (err < 0)
return err;

Loading…
Cancel
Save