Mercurial > libavcodec.hg
diff h261dec.c @ 6481:493dc59d469a libavcodec
add FF_ prefix to all (frame)_TYPE usage
author | aurel |
---|---|
date | Sun, 09 Mar 2008 23:31:02 +0000 |
parents | 7100aeea042e |
children | 48759bfbd073 |
line wrap: on
line diff
--- a/h261dec.c Sun Mar 09 17:05:19 2008 +0000 +++ b/h261dec.c Sun Mar 09 23:31:02 2008 +0000 @@ -493,9 +493,9 @@ 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 @@ // 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);