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/dsputil_altivec.c | |
| 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/ppc/dsputil_altivec.c')
| -rw-r--r-- | libavcodec/ppc/dsputil_altivec.c | 3 |
1 files changed, 1 insertions, 2 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; |