---
Squashed the two patches together and fixed up the ppc part.
libavcodec/h264_parser.c | 18 +++++++++++++-----
libavcodec/ppc/h264dsp.c | 8 +++++++-
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index eadce69..27c78d9 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -25,14 +25,22 @@
* @author Michael Niedermayer <michae...@gmx.at>
*/
-#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 <assert.h>
+#include "parser.h"
typedef struct H264ParseContext {
H264Context h;
diff --git a/libavcodec/ppc/h264dsp.c b/libavcodec/ppc/h264dsp.c
index 90afbde..ce514e3 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 && HAVE_BIGENDIAN
--
2.4.10
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
