Mercurial > libavcodec.hg
diff cavsdec.c @ 8606:c3a96cea3453 libavcodec
rename XXX_t enums to cavs_XXX to fix POSIX namespace issue
author | stefang |
---|---|
date | Fri, 16 Jan 2009 17:45:54 +0000 |
parents | 33f51dd2491f |
children | 379d63485cb7 |
line wrap: on
line diff
--- a/cavsdec.c Fri Jan 16 17:20:17 2009 +0000 +++ b/cavsdec.c Fri Jan 16 17:45:54 2009 +0000 @@ -77,7 +77,7 @@ pmv_bw->y = m-(((den+(den*col_mv->y*pmv_bw->dist^m)-m-1)>>14)^m); } -static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, enum block_t size) { +static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, enum cavs_block size) { cavs_vector *dst = src + MV_BWD_OFFS; /* backward mv is the scaled and negated forward mv */ @@ -252,7 +252,7 @@ return 0; } -static void decode_mb_p(AVSContext *h, enum mb_t mb_type) { +static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) { GetBitContext *gb = &h->s.gb; int ref[4]; @@ -296,9 +296,9 @@ *h->col_type = mb_type; } -static void decode_mb_b(AVSContext *h, enum mb_t mb_type) { +static void decode_mb_b(AVSContext *h, enum cavs_mb mb_type) { int block; - enum sub_mb_t sub_type[4]; + enum cavs_sub_mb sub_type[4]; int flags; ff_cavs_init_mb(h); @@ -447,7 +447,7 @@ static int decode_pic(AVSContext *h) { MpegEncContext *s = &h->s; int skip_count; - enum mb_t mb_type; + enum cavs_mb mb_type; if (!s->context_initialized) { s->avctx->idct_algo = FF_IDCT_CAVS;