[FFmpeg-cvslog] r12323 - in trunk/libavcodec: 4xm.c cljr.c cyuv.c dsputil.c dv.c eval.c indeo3.c qdrw.c qpeg.c utils.c vcr1.c xl.c
aurel
subversion
Wed Mar 5 01:43:12 CET 2008
Author: aurel
Date: Wed Mar 5 01:43:11 2008
New Revision: 12323
Log:
remove more useless mpegvideo.h includes
Modified:
trunk/libavcodec/4xm.c
trunk/libavcodec/cljr.c
trunk/libavcodec/cyuv.c
trunk/libavcodec/dsputil.c
trunk/libavcodec/dv.c
trunk/libavcodec/eval.c
trunk/libavcodec/indeo3.c
trunk/libavcodec/qdrw.c
trunk/libavcodec/qpeg.c
trunk/libavcodec/utils.c
trunk/libavcodec/vcr1.c
trunk/libavcodec/xl.c
Modified: trunk/libavcodec/4xm.c
==============================================================================
--- trunk/libavcodec/4xm.c (original)
+++ trunk/libavcodec/4xm.c Wed Mar 5 01:43:11 2008
@@ -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 @@ static int decode_frame(AVCodecContext *
}
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 @@ static int decode_frame(AVCodecContext *
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);
Modified: trunk/libavcodec/cljr.c
==============================================================================
--- trunk/libavcodec/cljr.c (original)
+++ trunk/libavcodec/cljr.c Wed Mar 5 01:43:11 2008
@@ -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 @@ 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;
init_get_bits(&a->gb, buf, buf_size);
@@ -89,7 +90,7 @@ static int encode_frame(AVCodecContext *
int mb_x, mb_y;
*p = *pict;
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
emms_c();
Modified: trunk/libavcodec/cyuv.c
==============================================================================
--- trunk/libavcodec/cyuv.c (original)
+++ trunk/libavcodec/cyuv.c Wed Mar 5 01:43:11 2008
@@ -35,7 +35,6 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
typedef struct CyuvDecodeContext {
Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c (original)
+++ trunk/libavcodec/dsputil.c Wed Mar 5 01:43:11 2008
@@ -29,7 +29,6 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
#include "simple_idct.h"
#include "faandct.h"
#include "faanidct.h"
Modified: trunk/libavcodec/dv.c
==============================================================================
--- trunk/libavcodec/dv.c (original)
+++ trunk/libavcodec/dv.c Wed Mar 5 01:43:11 2008
@@ -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"
Modified: trunk/libavcodec/eval.c
==============================================================================
--- trunk/libavcodec/eval.c (original)
+++ trunk/libavcodec/eval.c Wed Mar 5 01:43:11 2008
@@ -29,7 +29,6 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
#include "eval.h"
#include <stdio.h>
Modified: trunk/libavcodec/indeo3.c
==============================================================================
--- trunk/libavcodec/indeo3.c (original)
+++ trunk/libavcodec/indeo3.c Wed Mar 5 01:43:11 2008
@@ -26,7 +26,6 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
#include "bytestream.h"
#include "indeo3data.h"
Modified: trunk/libavcodec/qdrw.c
==============================================================================
--- trunk/libavcodec/qdrw.c (original)
+++ trunk/libavcodec/qdrw.c Wed Mar 5 01:43:11 2008
@@ -25,7 +25,6 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
typedef struct QdrawContext{
AVCodecContext *avctx;
@@ -52,7 +51,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;
outdata = a->pic.data[0];
Modified: trunk/libavcodec/qpeg.c
==============================================================================
--- trunk/libavcodec/qpeg.c (original)
+++ trunk/libavcodec/qpeg.c Wed Mar 5 01:43:11 2008
@@ -25,7 +25,6 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
typedef struct QpegContext{
AVCodecContext *avctx;
Modified: trunk/libavcodec/utils.c
==============================================================================
--- trunk/libavcodec/utils.c (original)
+++ trunk/libavcodec/utils.c Wed Mar 5 01:43:11 2008
@@ -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 @@ void avcodec_default_free_buffers(AVCode
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 '?';
}
}
Modified: trunk/libavcodec/vcr1.c
==============================================================================
--- trunk/libavcodec/vcr1.c (original)
+++ trunk/libavcodec/vcr1.c Wed Mar 5 01:43:11 2008
@@ -25,7 +25,7 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
//#undef NDEBUG
//#include <assert.h>
@@ -55,7 +55,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;
for(i=0; i<16; i++){
@@ -122,7 +122,7 @@ static int encode_frame(AVCodecContext *
int mb_x, mb_y;
*p = *pict;
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
emms_c();
Modified: trunk/libavcodec/xl.c
==============================================================================
--- trunk/libavcodec/xl.c (original)
+++ trunk/libavcodec/xl.c Wed Mar 5 01:43:11 2008
@@ -25,7 +25,6 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
typedef struct VideoXLContext{
AVCodecContext *avctx;
@@ -58,7 +57,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;
Y = a->pic.data[0];
More information about the ffmpeg-cvslog
mailing list