Merge commit 'd24e9a99'

* commit 'd24e9a99':
  h264 does not depend on mpegvideo any more
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/h264.c

@@ -38,7 +38,6 @@
 #include "dsputil.h"
 #include "error_resilience.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "h264data.h"
 #include "h264chroma.h"

libavcodec/h264.h

@@ -33,13 +33,14 @@
 #include "dsputil.h"
 #include "error_resilience.h"
 #include "get_bits.h"
-#include "mpegvideo.h"
 #include "h264chroma.h"
 #include "h264dsp.h"
 #include "h264pred.h"
 #include "h264qpel.h"
 #include "mpegutils.h"
+#include "parser.h"
 #include "rectangle.h"
+#include "videodsp.h"
 
 #define H264_MAX_PICTURE_COUNT 36
 #define H264_MAX_THREADS       32

libavcodec/h264_cavlc.c

@@ -30,7 +30,6 @@
 
 #include "internal.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "h264data.h" // FIXME FIXME FIXME
 #include "h264_mvpred.h"

libavcodec/h264_direct.c

@@ -27,7 +27,6 @@
 
 #include "internal.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "mpegutils.h"
 #include "rectangle.h"

libavcodec/h264_loopfilter.c

@@ -29,7 +29,6 @@
 #include "libavutil/intreadwrite.h"
 #include "internal.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "mathops.h"
 #include "mpegutils.h"

libavcodec/h264data.h

@@ -32,7 +32,6 @@
 #include <stdint.h>
 
 #include "libavutil/rational.h"
-#include "mpegvideo.h"
 #include "h264.h"
 
 static const uint8_t golomb_to_pict_type[5] = {

libavcodec/svq3.c

@@ -44,7 +44,6 @@
 #include "internal.h"
 #include "avcodec.h"
 #include "mpegutils.h"
-#include "mpegvideo.h"
 #include "h264.h"
 
 #include "h264data.h" // FIXME FIXME FIXME