diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 20:29:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 20:29:40 +0200 |
| commit | b8cdf0472674223227ee52e466eb75fe590a707c (patch) | |
| tree | 240026b6450fa103f09ddf4ebba269cb0cbf872e /libavcodec/dsputil.h | |
| parent | 6779bf3f0fccad973c66af9894042fed19801b20 (diff) | |
| parent | 1173320249745eab01c901a39054fc0fced33c87 (diff) | |
| download | ffmpeg-b8cdf0472674223227ee52e466eb75fe590a707c.tar.gz | |
Merge commit '1173320249745eab01c901a39054fc0fced33c87'
* commit '1173320249745eab01c901a39054fc0fced33c87':
dsputil: Drop unused bit_depth parameter from all init functions
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 5f4ba349e7..9010729b90 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -99,12 +99,9 @@ int ff_check_alignment(void); void ff_set_cmp(DSPContext *c, me_cmp_func *cmp, int type); void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); -void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); -void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); -void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); +void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx); +void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx); +void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx); void ff_dsputil_init_dwt(DSPContext *c); |