[FFmpeg-cvslog] Merge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 23 18:08:41 2017 -0300| [c43fd1f279ced22626f7183f6e20404756228d84] | committer: James Almer

Merge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'

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

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c43fd1f279ced22626f7183f6e20404756228d84
---

 libavcodec/vaapi_encode_h265.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index bd327ff..754eb06 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -25,7 +25,7 @@
 #include "libavutil/pixfmt.h"
 
 #include "avcodec.h"
-#include "hevc.h"
+#include "hevcdec.h"
 #include "internal.h"
 #include "put_bits.h"
 #include "vaapi_encode.h"


======================================================================