Merge commit '52ed83fa1a7f5170447eff6fad0b6c57119596e9'

* commit '52ed83fa1a7f5170447eff6fad0b6c57119596e9':
  lavc/qsvdec: expose frame pic_type and key_frame

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavcodec/qsv.c
Simple merge

diff --cc libavcodec/qsv_internal.h
index c0305508dd552bf98eeac90b1eba432113c53fe8,07ddc5904464e9efc1f9986b346af063809fa790..5c33f187f401b3bb8a3e6babf7b132f254644889
--- 1/libavcodec/qsv_internal.h
--- 2/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@@ -50,7 -48,8 +50,9 @@@ typedef struct QSVMid 
  typedef struct QSVFrame {
      AVFrame *frame;
      mfxFrameSurface1 surface;
 +    mfxEncodeCtrl enc_ctrl;
+     mfxExtDecodedFrameInfo dec_info;
+     mfxExtBuffer *ext_param;
  
      int queued;
      int used;

diff --cc libavcodec/qsvdec.c
Simple merge