# HG changeset patch
# User aurel
# Date 1204675673 0
# Node ID 7fa807dd7958f1ae89d079a23fbaaf2d1051c046
# Parent  fe34160a1d1e62ae198ed2c953730766be48114a
remove #include "mpegvideo.h" where it is not needed

diff -r fe34160a1d1e -r 7fa807dd7958 asv1.c
--- a/asv1.c	Wed Mar 05 00:06:09 2008 +0000
+++ b/asv1.c	Wed Mar 05 00:07:53 2008 +0000
@@ -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 @@
         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 @@
     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 -r fe34160a1d1e -r 7fa807dd7958 dnxhddec.c
--- a/dnxhddec.c	Wed Mar 05 00:06:09 2008 +0000
+++ b/dnxhddec.c	Wed Mar 05 00:07:53 2008 +0000
@@ -26,7 +26,6 @@
 #include "bitstream.h"
 #include "dnxhddata.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 
 typedef struct {
     AVCodecContext *avctx;
diff -r fe34160a1d1e -r 7fa807dd7958 mjpegdec.c
--- a/mjpegdec.c	Wed Mar 05 00:06:09 2008 +0000
+++ b/mjpegdec.c	Wed Mar 05 00:07:53 2008 +0000
@@ -332,7 +332,7 @@
         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 -r fe34160a1d1e -r 7fa807dd7958 mjpegdec.h
--- a/mjpegdec.h	Wed Mar 05 00:06:09 2008 +0000
+++ b/mjpegdec.h	Wed Mar 05 00:07:53 2008 +0000
@@ -32,7 +32,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 
 #define MAX_COMPONENTS 4
 
diff -r fe34160a1d1e -r 7fa807dd7958 vp3.c
--- a/vp3.c	Wed Mar 05 00:06:09 2008 +0000
+++ b/vp3.c	Wed Mar 05 00:07:53 2008 +0000
@@ -36,7 +36,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
 
 #include "vp3data.h"
 #include "xiph.h"
diff -r fe34160a1d1e -r 7fa807dd7958 vp5.c
--- a/vp5.c	Wed Mar 05 00:06:09 2008 +0000
+++ b/vp5.c	Wed Mar 05 00:07:53 2008 +0000
@@ -27,7 +27,6 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "bitstream.h"
-#include "mpegvideo.h"
 
 #include "vp56.h"
 #include "vp56data.h"
diff -r fe34160a1d1e -r 7fa807dd7958 vp56.h
--- a/vp56.h	Wed Mar 05 00:06:09 2008 +0000
+++ b/vp56.h	Wed Mar 05 00:07:53 2008 +0000
@@ -26,7 +26,7 @@
 
 #include "vp56data.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
 #include "bytestream.h"
 
 
diff -r fe34160a1d1e -r 7fa807dd7958 vp6.c
--- a/vp6.c	Wed Mar 05 00:06:09 2008 +0000
+++ b/vp6.c	Wed Mar 05 00:07:53 2008 +0000
@@ -31,7 +31,6 @@
 #include "dsputil.h"
 #include "bitstream.h"
 #include "huffman.h"
-#include "mpegvideo.h"
 
 #include "vp56.h"
 #include "vp56data.h"