diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 02:57:24 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 02:57:41 +0100 |
commit | 797ef671dda9094640ade203a09dc59e9bf328a4 (patch) | |
tree | 01f686f189f26f0dc745dc5a4d70d6983b18aafc /libavcodec/ac3dsp.h | |
parent | 5d6c5dd36c024784a9cd36391c3698c2f1f2d2ab (diff) | |
parent | 98a7d560b4f835ba5b99b9974ee1a2c096198bea (diff) | |
download | ffmpeg-797ef671dda9094640ade203a09dc59e9bf328a4.tar.gz |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
matroskadec: set default duration for simple block
When building for MinGW32 disable strict ANSI compliancy.
ARM: fix ff_apply_window_int16_neon() prototype
configure: check for --as-needed support early
ARM: NEON optimised apply_window_int16()
ac3enc: NEON optimised shift functions
ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
mpeg12.c: fix slice threading for mpeg2 field picture mode.
ffmetadec.c: fix compiler warnings.
configure: Don't explicitly disable ffplay or in/outdevices on dos
configure: Remove the explicit disabling of ffserver
configure: Add fork as a dependency to ffserver
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3dsp.h')
-rw-r--r-- | libavcodec/ac3dsp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index 0a2dedf478..66dc32bd03 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -84,6 +84,7 @@ typedef struct AC3DSPContext { } AC3DSPContext; void ff_ac3dsp_init (AC3DSPContext *c, int bit_exact); +void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact); void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact); #endif /* AVCODEC_AC3DSP_H */ |