diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 23:56:49 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 23:58:03 +0400 |
| commit | 268d93172460f116d239c2cf815d7b2f495efb2d (patch) | |
| tree | 6648863bf756cd7820d36f61d03d24d7bf7f64af /libavcodec/atrac3plusdsp.c | |
| parent | 92b2404571bcdd294d6ef0e614eee55432e959a7 (diff) | |
| parent | e6f0bb65270be51ea43345a28f8e4b1a728f7d0e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ATRAC3+ decoder
Conflicts:
Changelog
configure
libavcodec/atrac3plus.c
libavcodec/atrac3plus.h
libavcodec/atrac3plus_data.h
libavcodec/atrac3plusdec.c
libavcodec/atrac3plusdsp.c
libavcodec/version.h
See: 2e1fb96af36348479e14aa85f445915ea09e70fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac3plusdsp.c')
| -rw-r--r-- | libavcodec/atrac3plusdsp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/atrac3plusdsp.c b/libavcodec/atrac3plusdsp.c index f8624b567b..3522af1e5a 100644 --- a/libavcodec/atrac3plusdsp.c +++ b/libavcodec/atrac3plusdsp.c @@ -116,6 +116,7 @@ av_cold void ff_atrac3p_init_wave_synth(void) * @param[in] synth_param ptr to common synthesis parameters * @param[in] waves_info parameters for each sine wave * @param[in] envelope envelope data for all waves in a group + * @param[in] phase_shift flag indicates 180° phase shift * @param[in] reg_offset region offset for trimming envelope data * @param[out] out receives sythesized data */ |