diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-02 05:12:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-02 05:12:10 +0200 |
| commit | cd8cb54990be4fbd23e28f9d7c2c6170d3667692 (patch) | |
| tree | 28965f743e1e731b5a7616cbd7b0551c416da327 /libavcodec/arm/ac3dsp_init_arm.c | |
| parent | 06a9da736554197601e4062298fcf45a5e8d49ff (diff) | |
| parent | 8e112df409061034202b98fcc6ce2c1c670c0dda (diff) | |
| download | ffmpeg-cd8cb54990be4fbd23e28f9d7c2c6170d3667692.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: ac3dsp: optimised update_bap_counts()
mpegaudiodec: Fix av_dlog() invocation.
h264/10bit: add HAVE_ALIGNED_STACK checks.
Update 8-bit H.264 IDCT function names to reflect bit-depth.
Add IDCT functions for 10-bit H.264.
mpegaudioenc: Fix broken av_dlog statement.
Employ correct printf format specifiers, mostly in debug output.
ARM: fix MUL64 inline asm for pre-armv6
Conflicts:
libavcodec/mpegaudioenc.c
libavformat/ape.c
libavformat/mxfdec.c
libavformat/r3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/ac3dsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/ac3dsp_init_arm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/arm/ac3dsp_init_arm.c b/libavcodec/arm/ac3dsp_init_arm.c index 65790cdc51..5a9fdf0071 100644 --- a/libavcodec/arm/ac3dsp_init_arm.c +++ b/libavcodec/arm/ac3dsp_init_arm.c @@ -35,10 +35,12 @@ void ff_ac3_bit_alloc_calc_bap_armv6(int16_t *mask, int16_t *psd, int snr_offset, int floor, const uint8_t *bap_tab, uint8_t *bap); -int ff_ac3_compute_mantissa_size_arm(int cnt[5], uint8_t *bap, int nb_coefs); +void ff_ac3_update_bap_counts_arm(uint16_t mant_cnt[16], uint8_t *bap, int len); av_cold void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact) { + c->update_bap_counts = ff_ac3_update_bap_counts_arm; + if (HAVE_ARMV6) { c->bit_alloc_calc_bap = ff_ac3_bit_alloc_calc_bap_armv6; } |