[FFmpeg-cvslog] Merge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 24 11:36:44 2016 +0100| [64ae08ffec1a07803dc1acdb6d0bcd8e628040c2] | committer: Derek Buitenhuis

Merge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'

* commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db':
  h264: Clean up #includes

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

 libavcodec/h264_parser.c |   16 +++++++++++++---
 libavcodec/ppc/h264dsp.c |    8 +++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 12d6397..cbf5b3a 100644
--- a/libavcodec/h264_parser.c
+++ b/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;
diff --git a/libavcodec/ppc/h264dsp.c b/libavcodec/ppc/h264dsp.c
index 4a048a1..1bc8058 100644
--- a/libavcodec/ppc/h264dsp.c
+++ b/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


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

diff --cc libavcodec/h264_parser.c
index 12d6397,27c78d9..cbf5b3a
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@@ -25,14 -25,22 +25,24 @@@
   * @author Michael Niedermayer <michaelni at gmx.at>
   */
  
 +#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;
diff --cc libavcodec/ppc/h264dsp.c
index 4a048a1,ce514e3..1bc8058
--- a/libavcodec/ppc/h264dsp.c
+++ b/libavcodec/ppc/h264dsp.c
@@@ -25,10 -30,11 +30,11 @@@
  #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 && HAVE_BIGENDIAN
 +#if HAVE_ALTIVEC
  
  /****************************************************************************
   * IDCT transform: