Merge commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa'

* commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa':
  qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as well

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/qsv.c
Simple merge

diff --cc libavcodec/qsv_internal.h
index 82e1029a8bd1ccb17fb219b4229e4b91f661a61e,e8657417f30a236de20accf07b08a123a647f9a9..5d2a216ce6fc73787a5fd55e1296e9f7e68e93a1
--- 1/libavcodec/qsv_internal.h
--- 2/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@@ -63,8 -60,9 +63,10 @@@ typedef struct QSVFramesContext 
  int ff_qsv_error(int mfx_err);
  
  int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id);
 +int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile);
  
+ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc);
+ 
  int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session,
                                   const char *load_plugins);
  

diff --cc libavcodec/qsvdec.c
Simple merge

diff --cc libavcodec/qsvdec.h
Simple merge