Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 14:34:12 +0000 (16:34 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 14:34:12 +0000 (16:34 +0200)
commit9c943e077bfc23ba8d2e76a17fef7acbab4dd706
tree62bba1edfa79d9b614746ba9f620a0ca51d72638
parentf929081f2e64d979fd8c58b17705e9554f99baf9
parent69b92f1b99f3f210be19ee6ec06f6c0de1733031
Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'

* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
  qsvenc: properly handle asynchronous encoding

Conflicts:
libavcodec/qsvenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/qsvenc.c
libavcodec/qsvenc.h