Merge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:08:41 +0000 (18:08 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:08:41 +0000 (18:08 -0300)
commitc43fd1f279ced22626f7183f6e20404756228d84
treec86f514f6b173765ffa55038b7e8685004be14c2
parent29db87af522c22c74be1689fb8c71bf1872482c8
parentf9bb356e0eb38ab4df32df8276b71a0b2626538f
Merge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'

* commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f':
  vaapi_h265: Include header for slice types

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/vaapi_encode_h265.c