Merge commit '02cd8bb9'

* commit '02cd8bb9':
  h264: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libavcodec/h264_parser.c

@@ -27,12 +27,22 @@
 
 #define UNCHECKED_BITSTREAM_READER 1
 
-#include "libavutil/attributes.h"
-#include "parser.h"
-#include "h264data.h"
+#include <assert.h>
+#include <stdint.h>
+
+#include "libavutil/avutil.h"
+#include "libavutil/error.h"
+#include "libavutil/log.h"
+#include "libavutil/mem.h"
+#include "libavutil/pixfmt.h"
+
+#include "get_bits.h"
 #include "golomb.h"
+#include "h264.h"
+#include "h264data.h"
 #include "internal.h"
 #include "mpegutils.h"
+#include "parser.h"
 
 typedef struct H264ParseContext {
     H264Context h;

libavcodec/ppc/h264dsp.c

@@ -19,13 +19,19 @@
  */
 
 #include "config.h"
+
+#include <stdint.h>
+#include <string.h>
+
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem.h"
 #include "libavutil/ppc/cpu.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/h264data.h"
+
+#include "libavcodec/h264.h"
 #include "libavcodec/h264dsp.h"
 
 #if HAVE_ALTIVEC