Mercurial > libavcodec.hg
diff rv10.c @ 6481:493dc59d469a libavcodec
add FF_ prefix to all (frame)_TYPE usage
author | aurel |
---|---|
date | Sun, 09 Mar 2008 23:31:02 +0000 |
parents | a56227a0b738 |
children | 48759bfbd073 |
line wrap: on
line diff
--- a/rv10.c Sun Mar 09 17:05:19 2008 +0000 +++ b/rv10.c Sun Mar 09 23:31:02 2008 +0000 @@ -240,13 +240,13 @@ put_bits(&s->pb, 1, 1); /* marker */ - put_bits(&s->pb, 1, (s->pict_type == P_TYPE)); + put_bits(&s->pb, 1, (s->pict_type == FF_P_TYPE)); put_bits(&s->pb, 1, 0); /* not PB frame */ put_bits(&s->pb, 5, s->qscale); - if (s->pict_type == I_TYPE) { + if (s->pict_type == FF_I_TYPE) { /* specific MPEG like DC coding not used */ } /* if multiple packets per frame are sent, the position at which @@ -273,13 +273,13 @@ assert(s->f_code == 1); assert(s->unrestricted_mv == 1); -// assert(s->h263_aic== (s->pict_type == I_TYPE)); +// assert(s->h263_aic== (s->pict_type == FF_I_TYPE)); assert(s->alt_inter_vlc == 0); assert(s->umvplus == 0); assert(s->modified_quant==1); assert(s->loop_filter==1); - s->h263_aic= s->pict_type == I_TYPE; + s->h263_aic= s->pict_type == FF_I_TYPE; if(s->h263_aic){ s->y_dc_scale_table= s->c_dc_scale_table= ff_aic_dc_scale_table; @@ -315,9 +315,9 @@ marker = get_bits1(&s->gb); if (get_bits1(&s->gb)) - s->pict_type = P_TYPE; + s->pict_type = FF_P_TYPE; else - s->pict_type = I_TYPE; + s->pict_type = FF_I_TYPE; //printf("h:%X ver:%d\n",h,s->rv10_version); if(!marker) av_log(s->avctx, AV_LOG_ERROR, "marker missing\n"); pb_frame = get_bits1(&s->gb); @@ -337,7 +337,7 @@ return -1; } - if (s->pict_type == I_TYPE) { + if (s->pict_type == FF_I_TYPE) { if (s->rv10_version == 3) { /* specific MPEG like DC coding not used */ s->last_dc[0] = get_bits(&s->gb, 8); @@ -402,16 +402,16 @@ i= get_bits(&s->gb, 2); switch(i){ - case 0: s->pict_type= I_TYPE; break; - case 1: s->pict_type= I_TYPE; break; //hmm ... - case 2: s->pict_type= P_TYPE; break; - case 3: s->pict_type= B_TYPE; break; + case 0: s->pict_type= FF_I_TYPE; break; + case 1: s->pict_type= FF_I_TYPE; break; //hmm ... + case 2: s->pict_type= FF_P_TYPE; break; + case 3: s->pict_type= FF_B_TYPE; break; default: av_log(s->avctx, AV_LOG_ERROR, "unknown frame type\n"); return -1; } - if(s->last_picture_ptr==NULL && s->pict_type==B_TYPE){ + if(s->last_picture_ptr==NULL && s->pict_type==FF_B_TYPE){ av_log(s->avctx, AV_LOG_ERROR, "early B pix\n"); return -1; } @@ -482,7 +482,7 @@ if(seq - s->time > 0x4000) seq -= 0x8000; if(seq - s->time < -0x4000) seq += 0x8000; if(seq != s->time){ - if(s->pict_type!=B_TYPE){ + if(s->pict_type!=FF_B_TYPE){ s->time= seq; s->pp_time= s->time - s->last_non_b_time; s->last_non_b_time= s->time; @@ -505,7 +505,7 @@ s->f_code = 1; s->unrestricted_mv = 1; - s->h263_aic= s->pict_type == I_TYPE; + s->h263_aic= s->pict_type == FF_I_TYPE; // s->alt_inter_vlc=1; // s->obmc=1; // s->umvplus=1; @@ -517,7 +517,7 @@ seq, s->mb_x, s->mb_y, s->pict_type, s->qscale, s->no_rounding); } - assert(s->pict_type != B_TYPE || !s->low_delay); + assert(s->pict_type != FF_B_TYPE || !s->low_delay); return s->mb_width*s->mb_height - mb_pos; } @@ -623,7 +623,7 @@ av_log(s->avctx, AV_LOG_ERROR, "COUNT ERROR\n"); return -1; } -//if(s->pict_type == P_TYPE) return 0; +//if(s->pict_type == FF_P_TYPE) return 0; if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) { if(s->current_picture_ptr){ //FIXME write parser so we always have complete frames? @@ -690,7 +690,7 @@ av_log(s->avctx, AV_LOG_ERROR, "ERROR at MB %d %d\n", s->mb_x, s->mb_y); return -1; } - if(s->pict_type != B_TYPE) + if(s->pict_type != FF_B_TYPE) ff_h263_update_motion_val(s); MPV_decode_mb(s, s->block); if(s->loop_filter) @@ -759,7 +759,7 @@ ff_er_frame_end(s); MPV_frame_end(s); - if (s->pict_type == B_TYPE || s->low_delay) { + if (s->pict_type == FF_B_TYPE || s->low_delay) { *pict= *(AVFrame*)s->current_picture_ptr; } else if (s->last_picture_ptr != NULL) { *pict= *(AVFrame*)s->last_picture_ptr;