RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2014-07-11 20:29:40 +02:00
parent 6779bf3f0f 1173320249
commit b8cdf04726
11 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/arm/dsputil_arm.h
View File

@ -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 */

5
libavcodec/arm/dsputil_init_arm.c
View File

@ -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);
}

3
libavcodec/arm/dsputil_init_armv6.c
View File

@ -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;

8
libavcodec/dsputil.c
View File

@ -939,8 +939,6 @@ int ff_check_alignment(void)
av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx)
{
const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8;
ff_check_alignment();
c->sum_abs_dctelem = sum_abs_dctelem_c;
@ -992,11 +990,11 @@ av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx)
if (ARCH_ALPHA)
ff_dsputil_init_alpha(c, avctx);
if (ARCH_ARM)
ff_dsputil_init_arm(c, avctx, high_bit_depth);
ff_dsputil_init_arm(c, avctx);
if (ARCH_PPC)
ff_dsputil_init_ppc(c, avctx, high_bit_depth);
ff_dsputil_init_ppc(c, avctx);
if (ARCH_X86)
ff_dsputil_init_x86(c, avctx, high_bit_depth);
ff_dsputil_init_x86(c, avctx);
}
av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)

9
libavcodec/dsputil.h
View File

@ -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);

3
libavcodec/ppc/dsputil_altivec.c
View File

@ -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;

3
libavcodec/ppc/dsputil_altivec.h
View File

@ -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 */

5
libavcodec/ppc/dsputil_ppc.c
View File

@ -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);
}
}

5
libavcodec/x86/dsputil_init.c
View File

@ -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);
}

3
libavcodec/x86/dsputil_x86.h
View File

@ -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);

3
libavcodec/x86/dsputilenc_mmx.c
View File

@ -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();