Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 22:56:05 +0000 (00:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 23:22:14 +0000 (01:22 +0200)
commit2d5e9451de3c7ab00cac6ec4aff290e12a2f190d
tree9934a09e3ad1f63796274ee59f216df19cd9ca02
parent6cc1fec41263add956b35af96d7c4a81c9436a65
parentf46bb608d9d76c543e4929dc8cffe36b84bd789e
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'

* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
  dsputil: Split off pixel block routines into their own context

Conflicts:
configure
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp_template.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
30 files changed:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/arm/dsputil_armv6.S
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/pixblockdsp_armv6.S
libavcodec/arm/pixblockdsp_init_arm.c
libavcodec/asv.h
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dvenc.c
libavcodec/libavcodec.v
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp.c
libavcodec/pixblockdsp.h
libavcodec/pixblockdsp_template.c
libavcodec/ppc/Makefile
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/pixblockdsp.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/pixblockdsp.asm
libavcodec/x86/pixblockdsp_init.c
libavfilter/vf_mpdecimate.c
libavfilter/vf_spp.c
libavfilter/vf_spp.h