From d37f007d54b69a1f13142e14f42246e8a4422e63 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Wed, 5 Mar 2008 00:07:53 +0000
Subject: [PATCH] remove #include "mpegvideo.h" where it is not needed

Originally committed as revision 12321 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/asv1.c     | 6 +++---
 libavcodec/dnxhddec.c | 1 -
 libavcodec/mjpegdec.c | 2 +-
 libavcodec/mjpegdec.h | 1 -
 libavcodec/vp3.c      | 2 +-
 libavcodec/vp5.c      | 1 -
 libavcodec/vp56.h     | 2 +-
 libavcodec/vp6.c      | 1 -
 8 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index a0589cdd63..871fdf5917 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -27,7 +27,7 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "mpeg12data.h"
 
 //#undef NDEBUG
 //#include <assert.h>
@@ -402,7 +402,7 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
 
     a->bitstream_buffer= av_fast_realloc(a->bitstream_buffer, &a->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
@@ -476,7 +476,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     init_put_bits(&a->pb, buf, buf_size);
 
     *p = *pict;
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
 
     for(mb_y=0; mb_y<a->mb_height2; mb_y++){
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 8d3977ed56..a1ccf13a3e 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -26,7 +26,6 @@
 #include "bitstream.h"
 #include "dnxhddata.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 
 typedef struct {
     AVCodecContext *avctx;
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index e4184d54b6..6da13c2e45 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -332,7 +332,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
         av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
-    s->picture.pict_type= I_TYPE;
+    s->picture.pict_type= FF_I_TYPE;
     s->picture.key_frame= 1;
 
     for(i=0; i<3; i++){
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h
index d97b176a95..6c1e40f22e 100644
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@@ -32,7 +32,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 
 #define MAX_COMPONENTS 4
 
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index eade1eb3cf..b18095bc0e 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -36,7 +36,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
 
 #include "vp3data.h"
 #include "xiph.h"
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index fc8119c2f5..9a7f99723b 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -27,7 +27,6 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "bitstream.h"
-#include "mpegvideo.h"
 
 #include "vp56.h"
 #include "vp56data.h"
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index f85f947e7e..8167957ed5 100644
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -26,7 +26,7 @@
 
 #include "vp56data.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
 #include "bytestream.h"
 
 
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 896f06d4c4..26943e564f 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -31,7 +31,6 @@
 #include "dsputil.h"
 #include "bitstream.h"
 #include "huffman.h"
-#include "mpegvideo.h"
 
 #include "vp56.h"
 #include "vp56data.h"