From 9701840bb539546bc0cfb1307b04655140851b04 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 9 Mar 2008 23:31:02 +0000 Subject: add FF_ prefix to all (frame)_TYPE usage Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h261dec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec/h261dec.c') diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 264a7d3f58..4c94539231 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -493,9 +493,9 @@ static int h261_decode_picture_header(H261Context *h){ skip_bits(&s->gb, 8); } - // h261 has no I-FRAMES, but if we pass I_TYPE for the first frame, the codec crashes if it does + // h261 has no I-FRAMES, but if we pass FF_I_TYPE for the first frame, the codec crashes if it does // not contain all I-blocks (e.g. when a packet is lost) - s->pict_type = P_TYPE; + s->pict_type = FF_P_TYPE; h->gob_number = 0; return 0; @@ -593,12 +593,12 @@ retry: // for hurry_up==5 s->current_picture.pict_type= s->pict_type; - s->current_picture.key_frame= s->pict_type == I_TYPE; + s->current_picture.key_frame= s->pict_type == FF_I_TYPE; /* skip everything if we are in a hurry>=5 */ if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size); - if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==B_TYPE) - ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=I_TYPE) + if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) + ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) || avctx->skip_frame >= AVDISCARD_ALL) return get_consumed_bytes(s, buf_size); -- cgit v1.2.3