Merge commit 'd1cd20e4e33f8139e150034b3c457302312d81bd'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:44:50 +0000 (08:44 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:44:50 +0000 (08:44 +0100)
commited9cff9edf0f7f48d66e5700d154f79394f535a2
tree1aba91f6803131f1815de9e3e6b4821dad72e059
parentb5513441e477f63e9627ce6eb7c4cad475a4ba35
parentd1cd20e4e33f8139e150034b3c457302312d81bd
Merge commit 'd1cd20e4e33f8139e150034b3c457302312d81bd'

* commit 'd1cd20e4e33f8139e150034b3c457302312d81bd':
  qsvenc: split encoding frames and reading from the async FIFO

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/qsvenc.c