[FFmpeg-cvslog] Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 19 16:34:12 2015 +0200| [9c943e077bfc23ba8d2e76a17fef7acbab4dd706] | committer: Michael Niedermayer

Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'

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

Conflicts:
	libavcodec/qsvenc.c

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c943e077bfc23ba8d2e76a17fef7acbab4dd706
---