Mercurial > libavcodec.hg

changeset 6450:c32be43b52b2 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove more useless mpegvideo.h includes
author aurel
date Wed, 05 Mar 2008 00:43:11 +0000
parents 208074826b34
children 355b2eb9f553
files 4xm.c cljr.c cyuv.c dsputil.c dv.c eval.c indeo3.c qdrw.c qpeg.c utils.c vcr1.c xl.c
diffstat 12 files changed, 21 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/4xm.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/4xm.c	Wed Mar 05 00:43:11 2008 +0000
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
 #include "bytestream.h"
 
 //#undef NDEBUG
@@ -756,15 +756,15 @@
     }
 
     if(frame_4cc == ff_get_fourcc("ifr2")){
-        p->pict_type= I_TYPE;
+        p->pict_type= FF_I_TYPE;
         if(decode_i2_frame(f, buf-4, frame_size) < 0)
             return -1;
     }else if(frame_4cc == ff_get_fourcc("ifrm")){
-        p->pict_type= I_TYPE;
+        p->pict_type= FF_I_TYPE;
         if(decode_i_frame(f, buf, frame_size) < 0)
             return -1;
     }else if(frame_4cc == ff_get_fourcc("pfrm") || frame_4cc == ff_get_fourcc("pfr2")){
-        p->pict_type= P_TYPE;
+        p->pict_type= FF_P_TYPE;
         if(decode_p_frame(f, buf, frame_size) < 0)
             return -1;
     }else if(frame_4cc == ff_get_fourcc("snd_")){
@@ -773,7 +773,7 @@
         av_log(avctx, AV_LOG_ERROR, "ignoring unknown chunk length:%d\n", buf_size);
     }
 
-    p->key_frame= p->pict_type == I_TYPE;
+    p->key_frame= p->pict_type == FF_I_TYPE;
 
     *picture= *p;
     *data_size = sizeof(AVPicture);
--- a/cljr.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/cljr.c	Wed Mar 05 00:43:11 2008 +0000
@@ -25,7 +25,8 @@
  */
 
 #include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
+#include "bitstream.h"
 
 typedef struct CLJRContext{
     AVCodecContext *avctx;
@@ -52,7 +53,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;
 
     init_get_bits(&a->gb, buf, buf_size);
@@ -89,7 +90,7 @@
     int mb_x, mb_y;
 
     *p = *pict;
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
 
     emms_c();
--- a/cyuv.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/cyuv.c	Wed Mar 05 00:43:11 2008 +0000
@@ -35,7 +35,6 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 
 
 typedef struct CyuvDecodeContext {
--- a/dsputil.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/dsputil.c	Wed Mar 05 00:43:11 2008 +0000
@@ -29,7 +29,6 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 #include "simple_idct.h"
 #include "faandct.h"
 #include "faanidct.h"
--- a/dv.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/dv.c	Wed Mar 05 00:43:11 2008 +0000
@@ -36,7 +36,7 @@
 #define ALT_BITSTREAM_READER
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
 #include "simple_idct.h"
 #include "dvdata.h"
 
--- a/eval.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/eval.c	Wed Mar 05 00:43:11 2008 +0000
@@ -29,7 +29,6 @@
  */
 
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "eval.h"
 
 #include <stdio.h>
--- a/indeo3.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/indeo3.c	Wed Mar 05 00:43:11 2008 +0000
@@ -26,7 +26,6 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 #include "bytestream.h"
 
 #include "indeo3data.h"
--- a/qdrw.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/qdrw.c	Wed Mar 05 00:43:11 2008 +0000
@@ -25,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "mpegvideo.h"
 
 typedef struct QdrawContext{
     AVCodecContext *avctx;
@@ -52,7 +51,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;
 
     outdata = a->pic.data[0];
--- a/qpeg.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/qpeg.c	Wed Mar 05 00:43:11 2008 +0000
@@ -25,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "mpegvideo.h"
 
 typedef struct QpegContext{
     AVCodecContext *avctx;
--- a/utils.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/utils.c	Wed Mar 05 00:43:11 2008 +0000
@@ -27,7 +27,6 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 #include "integer.h"
 #include "opt.h"
 #include "crc.h"
@@ -1284,12 +1283,12 @@
 
 char av_get_pict_type_char(int pict_type){
     switch(pict_type){
-    case I_TYPE: return 'I';
-    case P_TYPE: return 'P';
-    case B_TYPE: return 'B';
-    case S_TYPE: return 'S';
-    case SI_TYPE:return 'i';
-    case SP_TYPE:return 'p';
+    case FF_I_TYPE: return 'I';
+    case FF_P_TYPE: return 'P';
+    case FF_B_TYPE: return 'B';
+    case FF_S_TYPE: return 'S';
+    case FF_SI_TYPE:return 'i';
+    case FF_SP_TYPE:return 'p';
     default:     return '?';
     }
 }
--- a/vcr1.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/vcr1.c	Wed Mar 05 00:43:11 2008 +0000
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
 
 //#undef NDEBUG
 //#include <assert.h>
@@ -55,7 +55,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;
 
     for(i=0; i<16; i++){
@@ -122,7 +122,7 @@
     int mb_x, mb_y;
 
     *p = *pict;
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
 
     emms_c();
--- a/xl.c	Wed Mar 05 00:38:14 2008 +0000
+++ b/xl.c	Wed Mar 05 00:43:11 2008 +0000
@@ -25,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "mpegvideo.h"
 
 typedef struct VideoXLContext{
     AVCodecContext *avctx;
@@ -58,7 +57,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;
 
     Y = a->pic.data[0];