[FFmpeg-cvslog] r12321 - in trunk/libavcodec: asv1.c dnxhddec.c mjpegdec.c mjpegdec.h vp3.c vp5.c vp56.h vp6.c

[aurel]

Author: aurel
Date: Wed Mar  5 01:07:53 2008
New Revision: 12321

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

Modified:
   trunk/libavcodec/asv1.c
   trunk/libavcodec/dnxhddec.c
   trunk/libavcodec/mjpegdec.c
   trunk/libavcodec/mjpegdec.h
   trunk/libavcodec/vp3.c
   trunk/libavcodec/vp5.c
   trunk/libavcodec/vp56.h
   trunk/libavcodec/vp6.c

Modified: trunk/libavcodec/asv1.c
==============================================================================
--- trunk/libavcodec/asv1.c	(original)
+++ trunk/libavcodec/asv1.c	Wed Mar  5 01:07:53 2008
@@ -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 *
         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 *
     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++){

Modified: trunk/libavcodec/dnxhddec.c
==============================================================================
--- trunk/libavcodec/dnxhddec.c	(original)
+++ trunk/libavcodec/dnxhddec.c	Wed Mar  5 01:07:53 2008
@@ -26,7 +26,6 @@
 #include "bitstream.h"
 #include "dnxhddata.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 
 typedef struct {
     AVCodecContext *avctx;

Modified: trunk/libavcodec/mjpegdec.c
==============================================================================
--- trunk/libavcodec/mjpegdec.c	(original)
+++ trunk/libavcodec/mjpegdec.c	Wed Mar  5 01:07:53 2008
@@ -332,7 +332,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeConte
         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++){

Modified: trunk/libavcodec/mjpegdec.h
==============================================================================
--- trunk/libavcodec/mjpegdec.h	(original)
+++ trunk/libavcodec/mjpegdec.h	Wed Mar  5 01:07:53 2008
@@ -32,7 +32,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 
 #define MAX_COMPONENTS 4
 

Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c	(original)
+++ trunk/libavcodec/vp3.c	Wed Mar  5 01:07:53 2008
@@ -36,7 +36,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
 
 #include "vp3data.h"
 #include "xiph.h"

Modified: trunk/libavcodec/vp5.c
==============================================================================
--- trunk/libavcodec/vp5.c	(original)
+++ trunk/libavcodec/vp5.c	Wed Mar  5 01:07:53 2008
@@ -27,7 +27,6 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "bitstream.h"
-#include "mpegvideo.h"
 
 #include "vp56.h"
 #include "vp56data.h"

Modified: trunk/libavcodec/vp56.h
==============================================================================
--- trunk/libavcodec/vp56.h	(original)
+++ trunk/libavcodec/vp56.h	Wed Mar  5 01:07:53 2008
@@ -26,7 +26,7 @@
 
 #include "vp56data.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
 #include "bytestream.h"
 
 

Modified: trunk/libavcodec/vp6.c
==============================================================================
--- trunk/libavcodec/vp6.c	(original)
+++ trunk/libavcodec/vp6.c	Wed Mar  5 01:07:53 2008
@@ -31,7 +31,6 @@
 #include "dsputil.h"
 #include "bitstream.h"
 #include "huffman.h"
-#include "mpegvideo.h"
 
 #include "vp56.h"
 #include "vp56data.h"