diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 18:15:02 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 18:15:02 +0400 |
| commit | 59b68ee8870ad7b831321ff39638660ac59e4a18 (patch) | |
| tree | e7d148ab5589e5869ed46914773ba5f140915ba1 /libavcodec/aacenc.c | |
| parent | a13148f63351db5f8283a23de9a22e940d29d8cd (diff) | |
| parent | 3d3cf6745e2a5dc9c377244454c3186d75b177fa (diff) | |
Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'
* commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa':
aacdec: use float planar sample format for output
Conflicts:
libavcodec/aacdec.c
libavcodec/aacsbr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacenc.c')
| -rw-r--r-- | libavcodec/aacenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 22962a396b..2c40ec91f5 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -191,7 +191,7 @@ WINDOW_FUNC(only_long) { const float *lwindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_long_1024 : ff_sine_1024; const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_long_1024 : ff_sine_1024; - float *out = sce->ret; + float *out = sce->ret_buf; fdsp->vector_fmul (out, audio, lwindow, 1024); dsp->vector_fmul_reverse(out + 1024, audio + 1024, pwindow, 1024); @@ -201,7 +201,7 @@ WINDOW_FUNC(long_start) { const float *lwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_long_1024 : ff_sine_1024; const float *swindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128; - float *out = sce->ret; + float *out = sce->ret_buf; fdsp->vector_fmul(out, audio, lwindow, 1024); memcpy(out + 1024, audio + 1024, sizeof(out[0]) * 448); @@ -213,7 +213,7 @@ WINDOW_FUNC(long_stop) { const float *lwindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_long_1024 : ff_sine_1024; const float *swindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; - float *out = sce->ret; + float *out = sce->ret_buf; memset(out, 0, sizeof(out[0]) * 448); fdsp->vector_fmul(out + 448, audio + 448, swindow, 128); @@ -226,7 +226,7 @@ WINDOW_FUNC(eight_short) const float *swindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128; const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; const float *in = audio + 448; - float *out = sce->ret; + float *out = sce->ret_buf; int w; for (w = 0; w < 8; w++) { @@ -251,7 +251,7 @@ static void apply_window_and_mdct(AACEncContext *s, SingleChannelElement *sce, float *audio) { int i; - float *output = sce->ret; + float *output = sce->ret_buf; apply_window[sce->ics.window_sequence[0]](&s->dsp, &s->fdsp, sce, audio); |