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/ppc | |
| parent | 6779bf3f0fccad973c66af9894042fed19801b20 (diff) | |
| parent | 1173320249745eab01c901a39054fc0fced33c87 (diff) | |
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/ppc')
| -rw-r--r-- | libavcodec/ppc/dsputil_altivec.c | 3 | ||||
| -rw-r--r-- | libavcodec/ppc/dsputil_altivec.h | 3 | ||||
| -rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c index 4cce30ac58..839e7a0ac0 100644 --- a/libavcodec/ppc/dsputil_altivec.c +++ b/libavcodec/ppc/dsputil_altivec.c @@ -741,8 +741,7 @@ static int hadamard8_diff16_altivec(MpegEncContext *s, uint8_t *dst, return score; } -av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx) { c->pix_abs[0][1] = sad16_x2_altivec; c->pix_abs[0][2] = sad16_y2_altivec; diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h index d4a97af479..936bb97a52 100644 --- a/libavcodec/ppc/dsputil_altivec.h +++ b/libavcodec/ppc/dsputil_altivec.h @@ -27,7 +27,6 @@ #include "libavcodec/dsputil.h" -void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); +void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx); #endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */ diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 720aafba80..c30d9bcec9 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -29,11 +29,10 @@ #include "libavcodec/dsputil.h" #include "dsputil_altivec.h" -av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx) { int mm_flags = av_get_cpu_flags(); if (PPC_ALTIVEC(mm_flags)) { - ff_dsputil_init_altivec(c, avctx, high_bit_depth); + ff_dsputil_init_altivec(c, avctx); } } |