remove #include "mpegvideo.h" where it is not needed

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12321 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index a0589cdd63f5b93011f9f86c63887b06e719ddd3..871fdf5917cda07659d72a81d430fe4c6369e70c 100644 (file)
--- 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 8d3977ed568244b1bfd8db1ffb8f09e1c491f3c7..a1ccf13a3ee1fd23ed5547849844616b5c11134a 100644 (file)
--- 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 e4184d54b6bbc23f7b9c041e2e7b140bdd2855dc..6da13c2e453e166e69b01faf40acad2554324d15 100644 (file)
--- 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 d97b176a950387155586922ed6706658f8288a0e..6c1e40f22edfdd184f117a8552b76da509a85254 100644 (file)
--- 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 eade1eb3cf7b949743aa2be5da76ca0a6c9afa20..b18095bc0e4a42d803a5e266916ec50d06eea829 100644 (file)
--- 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 fc8119c2f5c47357fdee114ba35b8596a1578d12..9a7f99723bf0b5ad5179ec1511638e23b519a804 100644 (file)
--- 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 f85f947e7ec2d79071022de5240c02475883a864..8167957ed5d2bb0e75a938368cabfd814f268dbc 100644 (file)
--- 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 896f06d4c4ee31fe1a9f1e8abb553e78cee9ac1e..26943e564f1b935ae0061de766823eda4eb903b4 100644 (file)
--- 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"