From fbd4293df9b0c9a1076da74b8e7a86cae6efdfe1 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Wed, 5 Mar 2008 00:43:11 +0000 Subject: remove more useless mpegvideo.h includes Originally committed as revision 12323 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/4xm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec/4xm.c') 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); -- cgit v1.2.3