-
James Almer authored
* commit '6f19bbcf': qsvdec: move reading the user-provided session to qsv_decode_init() Conflicts: libavcodec/qsvdec.c Merged-by:
James Almer <jamrial@gmail.com>
e9a5fc96
* commit '6f19bbcf': qsvdec: move reading the user-provided session to qsv_decode_init() Conflicts: libavcodec/qsvdec.c Merged-by:James Almer <jamrial@gmail.com>