diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-05 00:43:11 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-05 00:43:11 +0000 |
| commit | fbd4293df9b0c9a1076da74b8e7a86cae6efdfe1 (patch) | |
| tree | 62a8e8731210e359a6ac0ff3e4d1be79107b3ddd /libavcodec/4xm.c | |
| parent | cbcd6c8ca9bc9a36d990589c3a2bb7100b90ec3b (diff) | |
remove more useless mpegvideo.h includes
Originally committed as revision 12323 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index d833a3b186..13cd66fb85 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -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 *avctx, } 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 *avctx, 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); |