summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-12-15 10:08:31 +0000
committerDiego Biurrun <diego@biurrun.de>2008-12-15 10:08:31 +0000
commit9506090df9baca63520a438d8e13f211d8953733 (patch)
tree6eb14a2b1aa61734a55801fef4a337a2b1b9db8a /libavcodec
parent40f06241213a430a8f2ab65a98b280cb96c30fa1 (diff)
Avoid POSIX-reserved _t in identifier names.
Originally committed as revision 16142 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/cavs.h10
-rw-r--r--libavcodec/cavsdata.h6
-rw-r--r--libavcodec/cavsdec.c2
3 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h
index c684acf799..2a1a90eb9d 100644
--- a/libavcodec/cavs.h
+++ b/libavcodec/cavs.h
@@ -144,13 +144,13 @@ DECLARE_ALIGNED_8(typedef, struct) {
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 @@ typedef struct {
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 --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h
index 94b620b366..6d80ac11d9 100644
--- a/libavcodec/cavsdata.h
+++ b/libavcodec/cavsdata.h
@@ -101,7 +101,7 @@ const vector_t ff_cavs_intra_mv = {0,0,1,REF_INTRA};
#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_intra_dec[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_inter_dec[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 --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index a978fe1a1a..18dcb57fff 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -113,7 +113,7 @@ static inline int get_ue_code(GetBitContext *gb, int order) {
* @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];