Merge commit '52ed83fa1a7f5170447eff6fad0b6c57119596e9'
authorJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 22:58:05 +0000 (19:58 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 22:58:05 +0000 (19:58 -0300)
commit6f277e1f76121736baf98aedb2bf55d8bb413fa7
tree660a1641c04a4bcea7fb5b1ad15554a20444e3fd
parentb13a1210a242d2b3177592ec8687c6f579bff156
parent52ed83fa1a7f5170447eff6fad0b6c57119596e9
Merge commit '52ed83fa1a7f5170447eff6fad0b6c57119596e9'

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

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/qsv.c
libavcodec/qsv_internal.h
libavcodec/qsvdec.c