Merge commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:19:43 +0000 (15:19 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:19:43 +0000 (15:19 +0100)
commit1bc6cdf2fcbd3caea7b78d0a617c6e338606d756
tree9b0050a5d72d12d67b1fb82ffcc1a2a2effea7e9
parente122a725fbe9bc5c1bb6047d6be8e0f504d660b9
parent536bb17e9659c5ed7576a218d4085cdd6d5742fa
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>
libavcodec/qsv.c
libavcodec/qsv_internal.h
libavcodec/qsvdec.c
libavcodec/qsvdec.h