Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 13:27:11 +0000 (15:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 13:36:58 +0000 (15:36 +0200)
commit020865f557ccf06a41ecc461fd13ce6678817d04
tree657a0da279922b830200908b6e620be025e20b85
parent462c6cdb8ed256d2063815b67ca4d14e62e25802
parentc166148409fe8f0dbccef2fe684286a40ba1e37d
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>
21 files changed:
libavcodec/arm/Makefile
libavcodec/arm/dsputil_armv6.S
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/mpegvideoencdsp_armv6.S
libavcodec/arm/mpegvideoencdsp_init_arm.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/motion_est.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideoencdsp.c
libavcodec/mpegvideoencdsp.h
libavcodec/ppc/Makefile
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/mpegvideoencdsp.c
libavcodec/svq1enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/mpegvideoencdsp.asm
libavcodec/x86/mpegvideoencdsp_init.c