diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-29 18:53:57 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2011-05-02 12:18:44 +0200 |
commit | 975a1447f76e8d30fc01e6ea5466c84faf3d76e4 (patch) | |
tree | d462ee5cc7a2f59c44f797c97fc237c999c94e55 /libavcodec/4xm.c | |
parent | 6209669de4a0aa056ae05b0a2c78eaf2ca489b23 (diff) | |
download | ffmpeg-975a1447f76e8d30fc01e6ea5466c84faf3d76e4.tar.gz |
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/4xm.c')
-rw-r--r-- | libavcodec/4xm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index dc6f8bdcd6..176feb94c0 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -783,11 +783,11 @@ static int decode_frame(AVCodecContext *avctx, } if(frame_4cc == AV_RL32("ifr2")){ - p->pict_type= FF_I_TYPE; + p->pict_type= AV_PICTURE_TYPE_I; if(decode_i2_frame(f, buf-4, frame_size) < 0) return -1; }else if(frame_4cc == AV_RL32("ifrm")){ - p->pict_type= FF_I_TYPE; + p->pict_type= AV_PICTURE_TYPE_I; if(decode_i_frame(f, buf, frame_size) < 0) return -1; }else if(frame_4cc == AV_RL32("pfrm") || frame_4cc == AV_RL32("pfr2")){ @@ -799,7 +799,7 @@ static int decode_frame(AVCodecContext *avctx, } } - p->pict_type= FF_P_TYPE; + p->pict_type= AV_PICTURE_TYPE_P; if(decode_p_frame(f, buf, frame_size) < 0) return -1; }else if(frame_4cc == AV_RL32("snd_")){ @@ -808,7 +808,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 == FF_I_TYPE; + p->key_frame= p->pict_type == AV_PICTURE_TYPE_I; *picture= *p; *data_size = sizeof(AVPicture); |