highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '0d3176e32f351d18d6174d8b05796829a75a4c6b'

Browse Source 
* 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>
This commit is contained in:
Hendrik Leppkes
2017-04-01 18:53:27 +02:00
parent 358d4524cc 0d3176e32f
commit d91e7aac12
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/hwcontext_dxva2.c
View File

@@ -361,6 +361,10 @@ static int dxva2_map_from(AVHWFramesContext *ctx,
{ {
int err; 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); err = dxva2_map_frame(ctx, dst, src, flags);
if (err < 0) if (err < 0)
return err; return err;