[libav-devel] [PATCH 12/12] h264 does not depend on mpegvideo any more

Vittorio Giovara vittorio.giovara at gmail.com
Tue Mar 4 19:24:42 CET 2014


---
 libavcodec/h264.c            | 1 -
 libavcodec/h264.h            | 3 ++-
 libavcodec/h264_cavlc.c      | 1 -
 libavcodec/h264_direct.c     | 1 -
 libavcodec/h264_loopfilter.c | 1 -
 libavcodec/h264data.h        | 1 -
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 46f325b..eb4eeb9 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -35,7 +35,6 @@
 #include "dsputil.h"
 #include "error_resilience.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "h264data.h"
 #include "h264chroma.h"
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index b6716d1..f5b932e 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -33,14 +33,15 @@
 #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 "mbtype.h"
+#include "parser.h"
 #include "picttype.h"
 #include "rectangle.h"
+#include "videodsp.h"
 
 #define H264_MAX_PICTURE_COUNT 32
 #define H264_MAX_THREADS       16
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index d3f6dcb..6381914 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -29,7 +29,6 @@
 
 #include "internal.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "h264data.h" // FIXME FIXME FIXME
 #include "h264_mvpred.h"
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index f62251d..3debcb0 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -27,7 +27,6 @@
 
 #include "internal.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "rectangle.h"
 #include "thread.h"
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index 88ed34c..799d486 100644
--- a/libavcodec/h264_loopfilter.c
+++ b/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 "rectangle.h"
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index f90a267..6b40b39 100644
--- a/libavcodec/h264data.h
+++ b/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] = {
-- 
1.8.3.4 (Apple Git-47)



More information about the libav-devel mailing list