diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 23:18:17 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 23:18:17 +0300 |
| commit | a94eba6f0c0666de8ccbc56c62112d7e5f1132be (patch) | |
| tree | f926b3af6429d0318cb785aacace2d1b967f0a35 /libavcodec/atrac1.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/atrac1.c')
| -rw-r--r-- | libavcodec/atrac1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index aeb068c8fe..f965dcc20c 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -57,7 +57,7 @@ /** * Sound unit struct, one unit is used per channel */ -typedef struct { +typedef struct AT1SUCtx { int log2_block_count[AT1_QMF_BANDS]; ///< log2 number of blocks in a band int num_bfus; ///< number of Block Floating Units float* spectrum[2]; @@ -71,7 +71,7 @@ typedef struct { /** * The atrac1 context, holds all needed parameters for decoding */ -typedef struct { +typedef struct AT1Ctx { AT1SUCtx SUs[AT1_MAX_CHANNELS]; ///< channel sound unit DECLARE_ALIGNED(32, float, spec)[AT1_SU_SAMPLES]; ///< the mdct spectrum buffer |