diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:48:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:55:00 +0200 |
| commit | e80cbdbc57292a4687339f6a7d30e0dcff42f9e8 (patch) | |
| tree | c71ab556c3aa7a3307a39e24f7250d9645958aa8 /libavcodec/flacdsp.h | |
| parent | 744e4429cf9a2ac5c7c1e4ed8bfbb6f9f09a882a (diff) | |
| parent | 2568646abb6568b1d329f800a046832adc48acd4 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: drop unnecessary arguments to hpel_motion()
mpegvideo: drop 'inline' from some functions
nellymoserdec: drop support for s16 output.
bmpdec: only initialize palette for pal8.
build: Properly remove object files while cleaning
flacdsp: arm optimised lpc filter
compat/vsnprintf: return number of bytes required on truncation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdsp.h')
| -rw-r--r-- | libavcodec/flacdsp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/flacdsp.h b/libavcodec/flacdsp.h index efb5e02ef4..00be2659ce 100644 --- a/libavcodec/flacdsp.h +++ b/libavcodec/flacdsp.h @@ -30,5 +30,6 @@ typedef struct FLACDSPContext { } FLACDSPContext; void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int bps); +void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int bps); #endif /* AVCODEC_FLACDSP_H */ |