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)
* commit 'd1cd20e4e33f8139e150034b3c457302312d81bd':
  qsvenc: split encoding frames and reading from the async FIFO

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

Simple merge