diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-03 02:01:37 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-03 02:16:26 +0100 |
commit | 988f585fcb1cfb40fe4b706c32b31594b536bba0 (patch) | |
tree | 659b8d9f4daf4ce497b42c83f7adb45725fa4f65 /libavcodec/ac3enc_float.c | |
parent | 0b3e9d5dc61bb705d93db1e87d78d8d5131905c6 (diff) | |
parent | 594b54b51e9f3af8aac18184d634b85a836b42b6 (diff) | |
download | ffmpeg-988f585fcb1cfb40fe4b706c32b31594b536bba0.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (44 commits)
replacement Indeo 3 decoder
gsm demuxer: do not allocate packet twice.
flvenc: use first packet delay as global delay.
ac3enc: doxygen update.
imc: return error codes instead of 0 for error conditions.
imc: return meaningful error codes instead of -1
imc: do not set channel layout for stereo
imc: validate channel count
imc: check for ff_fft_init() failure
imc: check output buffer size before decoding
imc: use DSPContext.bswap16_buf() to byte-swap packet data
rtsp: add allowed_media_types option
libgsm: add flush function to reset the decoder state when seeking
libgsm: simplify decoding by using a loop
gsm: log error message when packet is too small
libgsmdec: do not needlessly set *data_size to 0
gsmdec: do not needlessly set *data_size to 0
gsmdec: add flush function to reset the decoder state when seeking
libgsmdec: check output buffer size before decoding
gsmdec: log error message when output buffer is too small.
...
Conflicts:
Changelog
ffplay.c
libavcodec/indeo3.c
libavcodec/mjpeg_parser.c
libavcodec/vp3.c
libavformat/cutils.c
libavformat/id3v2.c
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_float.c')
-rw-r--r-- | libavcodec/ac3enc_float.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index c87ae40e86..0d4000c05a 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -44,6 +44,8 @@ static const AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name, /** * Finalize MDCT and free allocated memory. + * + * @param s AC-3 encoder private context */ av_cold void ff_ac3_float_mdct_end(AC3EncodeContext *s) { @@ -54,7 +56,9 @@ av_cold void ff_ac3_float_mdct_end(AC3EncodeContext *s) /** * Initialize MDCT tables. - * @param nbits log2(MDCT size) + * + * @param s AC-3 encoder private context + * @return 0 on success, negative error code on failure */ av_cold int ff_ac3_float_mdct_init(AC3EncodeContext *s) { @@ -78,7 +82,7 @@ av_cold int ff_ac3_float_mdct_init(AC3EncodeContext *s) } -/** +/* * Apply KBD window to input samples prior to MDCT. */ static void apply_window(DSPContext *dsp, float *output, const float *input, @@ -88,7 +92,7 @@ static void apply_window(DSPContext *dsp, float *output, const float *input, } -/** +/* * Normalize the input samples. * Not needed for the floating-point encoder. */ @@ -98,7 +102,7 @@ static int normalize_samples(AC3EncodeContext *s) } -/** +/* * Scale MDCT coefficients from float to 24-bit fixed-point. */ static void scale_coefficients(AC3EncodeContext *s) @@ -117,7 +121,7 @@ static void sum_square_butterfly(AC3EncodeContext *s, float sum[4], s->ac3dsp.sum_square_butterfly_float(sum, coef0, coef1, len); } -/** +/* * Clip MDCT coefficients to allowable range. */ static void clip_coefficients(DSPContext *dsp, float *coef, unsigned int len) @@ -126,7 +130,7 @@ static void clip_coefficients(DSPContext *dsp, float *coef, unsigned int len) } -/** +/* * Calculate a single coupling coordinate. */ static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl) |