diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2016-05-31 01:05:58 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2016-05-31 01:08:25 +0100 |
| commit | a1953d4cec1609e010cde895cac649feb9f5fdaa (patch) | |
| tree | 9aa873025e197427bbd7388112e9c369d927b88f /libavcodec/aacpsy.c | |
| parent | 0d0b9397d63aeedb55f624ee2b976c0d391c494e (diff) | |
| download | ffmpeg-a1953d4cec1609e010cde895cac649feb9f5fdaa.tar.gz | |
aacpsy: remove dead code
This code wasn't removed when the functionality was moved inside
aacenc.c with commit 8005b6de4f88c9
Fixes CID1361962
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec/aacpsy.c')
| -rw-r--r-- | libavcodec/aacpsy.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 9644db17c3..a5fec7374e 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -885,7 +885,6 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, int grouping = 0; int uselongblock = 1; int attacks[AAC_NUM_BLOCKS_SHORT + 1] = { 0 }; - float clippings[AAC_NUM_BLOCKS_SHORT]; int i; FFPsyWindowInfo wi = { { 0 } }; @@ -977,7 +976,6 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, wi.window_type[1] = prev_type; if (wi.window_type[0] != EIGHT_SHORT_SEQUENCE) { - float clipping = 0.0f; wi.num_windows = 1; wi.grouping[0] = 1; @@ -986,9 +984,6 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, else wi.window_shape = 1; - for (i = 0; i < 8; i++) - clipping = FFMAX(clipping, clippings[i]); - wi.clipping[0] = clipping; } else { int lastgrp = 0; @@ -999,15 +994,6 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, lastgrp = i; wi.grouping[lastgrp]++; } - - for (i = 0; i < 8; i += wi.grouping[i]) { - int w; - float clipping = 0.0f; - for (w = 0; w < wi.grouping[i]; w++) - clipping = FFMAX(clipping, clippings[i+w]); - for (w = 0; w < wi.grouping[i]; w++) - wi.clipping[i+w] = clipping; - } } /* Determine grouping, based on the location of the first attack, and save for |