# HG changeset patch # User diego # Date 1229335711 0 # Node ID 0579157cbb146583fca470148484c71470724dfc # Parent 7c00e980c153789611daca22d429cbe12980ec1d Avoid POSIX-reserved _t in identifier names. diff -r 7c00e980c153 -r 0579157cbb14 cavs.h --- a/cavs.h Mon Dec 15 01:24:04 2008 +0000 +++ b/cavs.h Mon Dec 15 10:08:31 2008 +0000 @@ -144,13 +144,13 @@ int16_t ref; } vector_t; -typedef struct dec_2dvlc_t { +struct dec_2dvlc { int8_t rltab[59][3]; int8_t level_add[27]; int8_t golomb_order; int inc_limit; int8_t max_run; -} dec_2dvlc_t; +}; typedef struct { MpegEncContext s; @@ -226,9 +226,9 @@ extern const uint8_t ff_cavs_dequant_shift[64]; extern const uint16_t ff_cavs_dequant_mul[64]; -extern const dec_2dvlc_t ff_cavs_intra_dec[7]; -extern const dec_2dvlc_t ff_cavs_inter_dec[7]; -extern const dec_2dvlc_t ff_cavs_chroma_dec[5]; +extern const struct dec_2dvlc ff_cavs_intra_dec[7]; +extern const struct dec_2dvlc ff_cavs_inter_dec[7]; +extern const struct dec_2dvlc ff_cavs_chroma_dec[5]; extern const uint8_t ff_cavs_chroma_qp[64]; extern const uint8_t ff_cavs_scan3x3[4]; extern const uint8_t ff_cavs_partition_flags[30]; diff -r 7c00e980c153 -r 0579157cbb14 cavsdata.h --- a/cavsdata.h Mon Dec 15 01:24:04 2008 +0000 +++ b/cavsdata.h Mon Dec 15 10:08:31 2008 +0000 @@ -101,7 +101,7 @@ #define EOB 0,0,0 -const dec_2dvlc_t ff_cavs_intra_dec[7] = { +const struct dec_2dvlc ff_cavs_intra_dec[7] = { { { //level / run / table_inc { 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, @@ -238,7 +238,7 @@ } }; -const dec_2dvlc_t ff_cavs_inter_dec[7] = { +const struct dec_2dvlc ff_cavs_inter_dec[7] = { { { //level / run { 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, @@ -375,7 +375,7 @@ } }; -const dec_2dvlc_t ff_cavs_chroma_dec[5] = { +const struct dec_2dvlc ff_cavs_chroma_dec[5] = { { { //level / run { 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, diff -r 7c00e980c153 -r 0579157cbb14 cavsdec.c --- a/cavsdec.c Mon Dec 15 01:24:04 2008 +0000 +++ b/cavsdec.c Mon Dec 15 10:08:31 2008 +0000 @@ -113,7 +113,7 @@ * @param stride line stride in frame buffer */ static int decode_residual_block(AVSContext *h, GetBitContext *gb, - const dec_2dvlc_t *r, int esc_golomb_order, + const struct dec_2dvlc *r, int esc_golomb_order, int qp, uint8_t *dst, int stride) { int i, level_code, esc_code, level, run, mask; DCTELEM level_buf[65];