mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-08 00:45:34 +02:00
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>
This commit is contained in:
commit
d91e7aac12
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user