Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'
authorMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 21:00:03 +0000 (22:00 +0100)
committerMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 21:00:03 +0000 (22:00 +0100)
commit2f18e452f88fc6ed7b0e308d4de5c386ee1b3a12
treed46ae6e853bc8837cb691269d6c4cb4a0ee14a00
parente3f9c5826ace91bf8d933bd924df2eb4081da6c6
parent404e51478ecad060249d5b9bee6ab39a8a9d8c1c
Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'

* commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c':
  qsv{dec,enc}: always use an internal mfxFrameSurface1

Minor fixups for differences in the QSV encoder because of a53cc.

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/qsv_internal.h
libavcodec/qsvdec.c
libavcodec/qsvenc.c