[FFmpeg-cvslog] Merge commit '8ca39b855a7b0e4d9f726fa9d285bc8edcb953e6'

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Mon Mar  5 22:31:03 2018 +0000| [085a2eb8e27330c51df490f986cb5926077974d6] | committer: Mark Thompson

Merge commit '8ca39b855a7b0e4d9f726fa9d285bc8edcb953e6'

* commit '8ca39b855a7b0e4d9f726fa9d285bc8edcb953e6':
  qsv: Default PicStruct to progressive

Merged-by: Mark Thompson <sw at jkqxz.net>

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

 libavutil/hwcontext_qsv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
index 6228c04de5..0fefec341f 100644
--- a/libavutil/hwcontext_qsv.c
+++ b/libavutil/hwcontext_qsv.c
@@ -313,6 +313,7 @@ static int qsv_init_surface(AVHWFramesContext *ctx, mfxFrameSurface1 *surf)
     surf->Info.CropH          = ctx->height;
     surf->Info.FrameRateExtN  = 25;
     surf->Info.FrameRateExtD  = 1;
+    surf->Info.PicStruct      = MFX_PICSTRUCT_PROGRESSIVE;
 
     return 0;
 }


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