Merge commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9'
authorJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 16:26:12 +0000 (13:26 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 16:26:12 +0000 (13:26 -0300)
commite9a5fc967867f9bd361f472306ca130bb64b0b04
treebf88785dc19a742e8b121fd78ce2c65a71a3322d
parent32c25f06b79f9edcda726f6e043325d40036cdce
parent6f19bbcf8532d018d8d6d82e000738d0ac2385c9
Merge commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9'

* commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9':
  qsvdec: move reading the user-provided session to qsv_decode_init()

Conflicts:
    libavcodec/qsvdec.c

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