diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 03:01:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 03:09:08 +0200 |
| commit | 445fdc014017a236fa7aa2645ffad7e8d0b45bee (patch) | |
| tree | 1bd6be8b1dbf95535926c0e1348c63027ecb4339 /libavcodec/ac3.h | |
| parent | 55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d (diff) | |
| parent | 52fd16a264d1eb14b1a84b7b38041da1756fb216 (diff) | |
| download | ffmpeg-445fdc014017a236fa7aa2645ffad7e8d0b45bee.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: move compute_mantissa_size() to ac3dsp
ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext
Remove support for stripping executables
ac3enc: NEON optimised float_to_fixed24
ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp
dfa: protect pointer range checks against overflows.
Duplicate: mimic: implement multithreading.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3.h')
| -rw-r--r-- | libavcodec/ac3.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index b4092c4be6..371d0a2532 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -175,23 +175,4 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd, uint8_t *dba_lengths, uint8_t *dba_values, int16_t *mask); -/** - * Calculate bit allocation pointers. - * The SNR is the difference between the masking curve and the signal. AC-3 - * uses this value for each frequency bin to allocate bits. The snroffset - * parameter is a global adjustment to the SNR for all bins. - * - * @param[in] mask masking curve - * @param[in] psd signal power for each frequency bin - * @param[in] start starting bin location - * @param[in] end ending bin location - * @param[in] snr_offset SNR adjustment - * @param[in] floor noise floor - * @param[in] bap_tab look-up table for bit allocation pointers - * @param[out] bap bit allocation pointers - */ -void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end, - int snr_offset, int floor, - const uint8_t *bap_tab, uint8_t *bap); - #endif /* AVCODEC_AC3_H */ |