Merge commit '9c0bc1e980a99106d6749ec632f166b87275871e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:22:43 +0000 (17:22 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:22:43 +0000 (17:22 +0000)
commit0d4c0240affc09eb2c9f6ccacac2ed14321b1e34
tree1faae21394be2819f84b77970554581970dbc91f
parentf6d633d72686e89503dcdf0709e8d4da59ffca0b
parent9c0bc1e980a99106d6749ec632f166b87275871e
Merge commit '9c0bc1e980a99106d6749ec632f166b87275871e'

* commit '9c0bc1e980a99106d6749ec632f166b87275871e':
  qsv: add a missing #include

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/qsv_internal.h