[FFmpeg-cvslog] Merge commit 'd5759701a82926059ae3e2530805e900041a5419'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr 13 18:18:54 2017 -0300| [f416a8d66ac3fe4664b303bfa7c5617571cab1da] | committer: James Almer

Merge commit 'd5759701a82926059ae3e2530805e900041a5419'

* commit 'd5759701a82926059ae3e2530805e900041a5419':
  libkvazaar: Add missing header #includes

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

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

 libavcodec/libkvazaar.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c
index 79fde41bfb..f35b0df61d 100644
--- a/libavcodec/libkvazaar.c
+++ b/libavcodec/libkvazaar.c
@@ -21,13 +21,17 @@
  */
 
 #include <kvazaar.h>
+#include <stdint.h>
 #include <string.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/dict.h"
 #include "libavutil/error.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/log.h"
+#include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"
 


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

diff --cc libavcodec/libkvazaar.c
index 79fde41bfb,efc98f1f65..f35b0df61d
--- a/libavcodec/libkvazaar.c
+++ b/libavcodec/libkvazaar.c
@@@ -21,9 -21,10 +21,11 @@@
   */
  
  #include <kvazaar.h>
+ #include <stdint.h>
  #include <string.h>
  
+ #include "libavutil/attributes.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/dict.h"
  #include "libavutil/error.h"
  #include "libavutil/imgutils.h"