Merge commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 13:54:14 +0000 (15:54 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 13:55:43 +0000 (15:55 +0200)
commit866a4174dba066780c7be1ebdaa0152161cdf3e0
tree18965c935c72e99a74a56b54ef150bad9df4ebe5
parenta440886a35e3329830d0c96311a80bd0f08ef6f3
parentdc923bc23b3efd949d0bf67ff1abdb95059e5843
Merge commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843'

* commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843':
  qsvenc: add an API for allocating opaque surfaces

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