highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove more useless mpegvideo.h includes

Browse Source 
Originally committed as revision 12323 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-03-05 00:43:11 +00:00
parent cbcd6c8ca9
commit fbd4293df9
12 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/4xm.c
View File

@ -26,7 +26,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "bitstream.h"
#include "bytestream.h" #include "bytestream.h"
//#undef NDEBUG //#undef NDEBUG
@ -756,15 +756,15 @@ static int decode_frame(AVCodecContext *avctx,
} }
if(frame_4cc == ff_get_fourcc("ifr2")){ 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) if(decode_i2_frame(f, buf-4, frame_size) < 0)
return -1; return -1;
}else if(frame_4cc == ff_get_fourcc("ifrm")){ }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) if(decode_i_frame(f, buf, frame_size) < 0)
return -1; return -1;
}else if(frame_4cc == ff_get_fourcc("pfrm") || frame_4cc == ff_get_fourcc("pfr2")){ }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) if(decode_p_frame(f, buf, frame_size) < 0)
return -1; return -1;
}else if(frame_4cc == ff_get_fourcc("snd_")){ }else if(frame_4cc == ff_get_fourcc("snd_")){
@ -773,7 +773,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "ignoring unknown chunk length:%d\n", buf_size); 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; *picture= *p;
*data_size = sizeof(AVPicture); *data_size = sizeof(AVPicture);

7
libavcodec/cljr.c
View File

@ -25,7 +25,8 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h" #include "dsputil.h"
#include "bitstream.h"
typedef struct CLJRContext{ typedef struct CLJRContext{
AVCodecContext *avctx; AVCodecContext *avctx;
@ -52,7 +53,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
p->pict_type= I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
init_get_bits(&a->gb, buf, buf_size); init_get_bits(&a->gb, buf, buf_size);
@ -89,7 +90,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
int mb_x, mb_y; int mb_x, mb_y;
*p = *pict; *p = *pict;
p->pict_type= I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
emms_c(); emms_c();

1
libavcodec/cyuv.c
View File

@ -35,7 +35,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h"
typedef struct CyuvDecodeContext { typedef struct CyuvDecodeContext {

1
libavcodec/dsputil.c
View File

@ -29,7 +29,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h"
#include "simple_idct.h" #include "simple_idct.h"
#include "faandct.h" #include "faandct.h"
#include "faanidct.h" #include "faanidct.h"

2
libavcodec/dv.c
View File

@ -36,7 +36,7 @@
#define ALT_BITSTREAM_READER #define ALT_BITSTREAM_READER
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "bitstream.h"
#include "simple_idct.h" #include "simple_idct.h"
#include "dvdata.h" #include "dvdata.h"

1
libavcodec/eval.c
View File

@ -29,7 +29,6 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h"
#include "eval.h" #include "eval.h"
#include <stdio.h> #include <stdio.h>

1
libavcodec/indeo3.c
View File

@ -26,7 +26,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h"
#include "bytestream.h" #include "bytestream.h"
#include "indeo3data.h" #include "indeo3data.h"

3
libavcodec/qdrw.c
View File

@ -25,7 +25,6 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h"
typedef struct QdrawContext{ typedef struct QdrawContext{
AVCodecContext *avctx; AVCodecContext *avctx;
@ -52,7 +51,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
p->pict_type= I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
outdata = a->pic.data[0]; outdata = a->pic.data[0];

1
libavcodec/qpeg.c
View File

@ -25,7 +25,6 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h"
typedef struct QpegContext{ typedef struct QpegContext{
AVCodecContext *avctx; AVCodecContext *avctx;

13
libavcodec/utils.c
View File

@ -27,7 +27,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h"
#include "integer.h" #include "integer.h"
#include "opt.h" #include "opt.h"
#include "crc.h" #include "crc.h"
@ -1284,12 +1283,12 @@ void avcodec_default_free_buffers(AVCodecContext *s){
char av_get_pict_type_char(int pict_type){ char av_get_pict_type_char(int pict_type){
switch(pict_type){ switch(pict_type){
case I_TYPE: return 'I'; case FF_I_TYPE: return 'I';
case P_TYPE: return 'P'; case FF_P_TYPE: return 'P';
case B_TYPE: return 'B'; case FF_B_TYPE: return 'B';
case S_TYPE: return 'S'; case FF_S_TYPE: return 'S';
case SI_TYPE:return 'i'; case FF_SI_TYPE:return 'i';
case SP_TYPE:return 'p'; case FF_SP_TYPE:return 'p';
default: return '?'; default: return '?';
} }
} }

6
libavcodec/vcr1.c
View File

@ -25,7 +25,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h" #include "dsputil.h"
//#undef NDEBUG //#undef NDEBUG
//#include <assert.h> //#include <assert.h>
@ -55,7 +55,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
p->pict_type= I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
for(i=0; i<16; i++){ for(i=0; i<16; i++){
@ -122,7 +122,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
int mb_x, mb_y; int mb_x, mb_y;
*p = *pict; *p = *pict;
p->pict_type= I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
emms_c(); emms_c();

3
libavcodec/xl.c
View File

@ -25,7 +25,6 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h"
typedef struct VideoXLContext{ typedef struct VideoXLContext{
AVCodecContext *avctx; AVCodecContext *avctx;
@ -58,7 +57,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
p->pict_type= I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
Y = a->pic.data[0]; Y = a->pic.data[0];