[FFmpeg-cvslog] Merge commit '0d3176e32f351d18d6174d8b05796829a75a4c6b'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Apr  1 18:53:27 2017 +0200| [d91e7aac122fef557afe9695ea2c9780ecc742ca] | committer: Hendrik Leppkes

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d91e7aac122fef557afe9695ea2c9780ecc742ca
---

 libavutil/hwcontext_dxva2.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c
index c5265b9..5294106 100644
--- a/libavutil/hwcontext_dxva2.c
+++ b/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;


======================================================================