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/arm | |
| 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/arm')
| -rw-r--r-- | libavcodec/arm/dsputil_arm.h | 3 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_arm.c | 5 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/libavcodec/arm/dsputil_arm.h b/libavcodec/arm/dsputil_arm.h index cd7957d0ff..2d258682a2 100644 --- a/libavcodec/arm/dsputil_arm.h +++ b/libavcodec/arm/dsputil_arm.h @@ -24,7 +24,6 @@ #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" -void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); +void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx); #endif /* AVCODEC_ARM_DSPUTIL_ARM_H */ diff --git a/libavcodec/arm/dsputil_init_arm.c b/libavcodec/arm/dsputil_init_arm.c index 1a7433cee6..7b56dbad38 100644 --- a/libavcodec/arm/dsputil_init_arm.c +++ b/libavcodec/arm/dsputil_init_arm.c @@ -28,11 +28,10 @@ #include "libavcodec/dsputil.h" #include "dsputil_arm.h" -av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); if (have_armv6(cpu_flags)) - ff_dsputil_init_armv6(c, avctx, high_bit_depth); + ff_dsputil_init_armv6(c, avctx); } diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index 86d84f5744..edd0a64df8 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -39,8 +39,7 @@ int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int line_size, int h); -av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx) { c->pix_abs[0][0] = ff_pix_abs16_armv6; c->pix_abs[0][1] = ff_pix_abs16_x2_armv6; |