diff options
| author | Maxim Poliakovski <max_pole@gmx.de> | 2013-10-02 02:23:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 10:37:05 +0200 |
| commit | dc80e250fc66c6dfe87f08313edbcd1e94e957e3 (patch) | |
| tree | f120ef9d53167a41b994cd2be86c43cd73d605f8 /libavcodec | |
| parent | 746cb9bc53f71ed8d67827c4518deecc4ba2a75d (diff) | |
| download | ffmpeg-dc80e250fc66c6dfe87f08313edbcd1e94e957e3.tar.gz | |
atrac3: Rename GainInfo to AtracGainInfo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/atrac3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index c2da6e2411..f3b5762353 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -55,14 +55,14 @@ #define SAMPLES_PER_FRAME 1024 #define MDCT_SIZE 512 -typedef struct GainInfo { +typedef struct AtracGainInfo { int num_gain_data; int lev_code[8]; int loc_code[8]; -} GainInfo; +} AtracGainInfo; typedef struct GainBlock { - GainInfo g_block[4]; + AtracGainInfo g_block[4]; } GainBlock; typedef struct TonalComponent { @@ -421,7 +421,7 @@ static int decode_gain_control(GetBitContext *gb, GainBlock *block, int i, cf, num_data; int *level, *loc; - GainInfo *gain = block->g_block; + AtracGainInfo *gain = block->g_block; for (i = 0; i <= num_bands; i++) { num_data = get_bits(gb, 3); @@ -454,8 +454,8 @@ static int decode_gain_control(GetBitContext *gb, GainBlock *block, * @param gain2 next band gain info */ static void gain_compensate_and_overlap(float *input, float *prev, - float *output, GainInfo *gain1, - GainInfo *gain2) + float *output, AtracGainInfo *gain1, + AtracGainInfo *gain2) { float g1, g2, gain_inc; int i, j, num_data, start_loc, end_loc; |