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)
* commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f':
  vaapi_h265: Include header for slice types

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

Simple merge