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/x86 | |
| 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/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_init.c | 5 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_x86.h | 3 | ||||
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 85c637b620..1d44dd6b31 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -27,9 +27,8 @@ #include "libavcodec/dsputil.h" #include "dsputil_x86.h" -av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx) { if (CONFIG_ENCODERS) - ff_dsputilenc_init_mmx(c, avctx, high_bit_depth); + ff_dsputilenc_init_mmx(c, avctx); } diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h index 3e6f364a44..419109548f 100644 --- a/libavcodec/x86/dsputil_x86.h +++ b/libavcodec/x86/dsputil_x86.h @@ -27,8 +27,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" -void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); +void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx); void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx); diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 5d48a78daa..86858e8e9c 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -342,8 +342,7 @@ static int vsad16_mmxext(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, #endif /* HAVE_INLINE_ASM */ -av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); |