Commit 9506090d authored by Diego Biurrun's avatar Diego Biurrun

Avoid POSIX-reserved _t in identifier names.

Originally committed as revision 16142 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 40f06241
...@@ -144,13 +144,13 @@ DECLARE_ALIGNED_8(typedef, struct) { ...@@ -144,13 +144,13 @@ DECLARE_ALIGNED_8(typedef, struct) {
int16_t ref; int16_t ref;
} vector_t; } vector_t;
typedef struct dec_2dvlc_t { struct dec_2dvlc {
int8_t rltab[59][3]; int8_t rltab[59][3];
int8_t level_add[27]; int8_t level_add[27];
int8_t golomb_order; int8_t golomb_order;
int inc_limit; int inc_limit;
int8_t max_run; int8_t max_run;
} dec_2dvlc_t; };
typedef struct { typedef struct {
MpegEncContext s; MpegEncContext s;
...@@ -226,9 +226,9 @@ typedef struct { ...@@ -226,9 +226,9 @@ typedef struct {
extern const uint8_t ff_cavs_dequant_shift[64]; extern const uint8_t ff_cavs_dequant_shift[64];
extern const uint16_t ff_cavs_dequant_mul[64]; extern const uint16_t ff_cavs_dequant_mul[64];
extern const dec_2dvlc_t ff_cavs_intra_dec[7]; extern const struct dec_2dvlc ff_cavs_intra_dec[7];
extern const dec_2dvlc_t ff_cavs_inter_dec[7]; extern const struct dec_2dvlc ff_cavs_inter_dec[7];
extern const dec_2dvlc_t ff_cavs_chroma_dec[5]; 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_chroma_qp[64];
extern const uint8_t ff_cavs_scan3x3[4]; extern const uint8_t ff_cavs_scan3x3[4];
extern const uint8_t ff_cavs_partition_flags[30]; extern const uint8_t ff_cavs_partition_flags[30];
......
...@@ -101,7 +101,7 @@ const vector_t ff_cavs_intra_mv = {0,0,1,REF_INTRA}; ...@@ -101,7 +101,7 @@ const vector_t ff_cavs_intra_mv = {0,0,1,REF_INTRA};
#define EOB 0,0,0 #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 { //level / run / table_inc
{ 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, { 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_intra_dec[7] = { ...@@ -238,7 +238,7 @@ const dec_2dvlc_t ff_cavs_intra_dec[7] = {
} }
}; };
const dec_2dvlc_t ff_cavs_inter_dec[7] = { const struct dec_2dvlc ff_cavs_inter_dec[7] = {
{ {
{ //level / run { //level / run
{ 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, { 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_inter_dec[7] = { ...@@ -375,7 +375,7 @@ const dec_2dvlc_t ff_cavs_inter_dec[7] = {
} }
}; };
const dec_2dvlc_t ff_cavs_chroma_dec[5] = { const struct dec_2dvlc ff_cavs_chroma_dec[5] = {
{ {
{ //level / run { //level / run
{ 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, { 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1},
......
...@@ -113,7 +113,7 @@ static inline int get_ue_code(GetBitContext *gb, int order) { ...@@ -113,7 +113,7 @@ static inline int get_ue_code(GetBitContext *gb, int order) {
* @param stride line stride in frame buffer * @param stride line stride in frame buffer
*/ */
static int decode_residual_block(AVSContext *h, GetBitContext *gb, 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 qp, uint8_t *dst, int stride) {
int i, level_code, esc_code, level, run, mask; int i, level_code, esc_code, level, run, mask;
DCTELEM level_buf[65]; DCTELEM level_buf[65];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment