diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:27:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:36:58 +0200 |
| commit | 020865f557ccf06a41ecc461fd13ce6678817d04 (patch) | |
| tree | 657a0da279922b830200908b6e620be025e20b85 /libavcodec/arm/dsputil_init_armv6.c | |
| parent | 462c6cdb8ed256d2063815b67ca4d14e62e25802 (diff) | |
| parent | c166148409fe8f0dbccef2fe684286a40ba1e37d (diff) | |
| download | ffmpeg-020865f557ccf06a41ecc461fd13ce6678817d04.tar.gz | |
Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'
* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d':
dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dsputil_init_armv6.c')
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index 57b90daa1e..1cfad42183 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -43,9 +43,6 @@ 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); -int ff_pix_norm1_armv6(uint8_t *pix, int line_size); -int ff_pix_sum_armv6(uint8_t *pix, int line_size); - av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth) { @@ -63,7 +60,4 @@ av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx, c->sad[1] = ff_pix_abs8_armv6; c->sse[0] = ff_sse16_armv6; - - c->pix_norm1 = ff_pix_norm1_armv6; - c->pix_sum = ff_pix_sum_armv6; } |