diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:18:17 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:18:17 +0100 |
commit | a94eba6f0c0666de8ccbc56c62112d7e5f1132be (patch) | |
tree | f926b3af6429d0318cb785aacace2d1b967f0a35 /libavcodec/vorbisdec.c | |
parent | a0fe1a25fa76809005cb90beb09e66cb7493b353 (diff) | |
parent | 7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0 (diff) |
Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'
* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0':
avcodec: Don't anonymously typedef structs
Conflicts:
libavcodec/alac.c
libavcodec/cinepak.c
libavcodec/cscd.c
libavcodec/dcadec.c
libavcodec/g723_1.c
libavcodec/gif.c
libavcodec/iff.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbisdec.c')
-rw-r--r-- | libavcodec/vorbisdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 09a863f277..0953b969bb 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -47,7 +47,7 @@ #define V_MAX_VLCS (1 << 16) #define V_MAX_PARTITIONS (1 << 20) -typedef struct { +typedef struct vorbis_codebook { uint8_t dimensions; uint8_t lookup_type; uint8_t maxdepth; @@ -63,7 +63,7 @@ struct vorbis_context_s; typedef int (* vorbis_floor_decode_func) (struct vorbis_context_s *, vorbis_floor_data *, float *); -typedef struct { +typedef struct vorbis_floor { uint8_t floor_type; vorbis_floor_decode_func decode; union vorbis_floor_u { @@ -93,7 +93,7 @@ typedef struct { } data; } vorbis_floor; -typedef struct { +typedef struct vorbis_residue { uint16_t type; uint32_t begin; uint32_t end; @@ -106,7 +106,7 @@ typedef struct { uint8_t *classifs; } vorbis_residue; -typedef struct { +typedef struct vorbis_mapping { uint8_t submaps; uint16_t coupling_steps; uint8_t *magnitude; @@ -116,7 +116,7 @@ typedef struct { uint8_t submap_residue[16]; } vorbis_mapping; -typedef struct { +typedef struct vorbis_mode { uint8_t blockflag; uint16_t windowtype; uint16_t transformtype; |