Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 02:41:48 +0000 (04:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 02:54:38 +0000 (04:54 +0200)
commit2b05db4f8102148d013755ac2a7e47f6d79ff7ca
tree8135823ee5f9db622126672b644e06c243ae3c01
parentab12373956e92b865bced9b05b12971f062cfd3e
parente74433a8e6fc00c8dbde293c97a3e45384c2c1d9
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'

* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9':
  dsputil: Split clear_block*/fill_block* off into a separate context

Conflicts:
configure
libavcodec/asvdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.h
libavcodec/eamad.c
libavcodec/intrax8.c
libavcodec/mjpegdec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
55 files changed:
configure
libavcodec/4xm.c
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/arm/blockdsp_arm.h
libavcodec/arm/blockdsp_init_arm.c
libavcodec/arm/blockdsp_init_neon.c
libavcodec/arm/blockdsp_neon.S
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/asv.h
libavcodec/asvdec.c
libavcodec/bink.c
libavcodec/blockdsp.c
libavcodec/blockdsp.h
libavcodec/cavs.c
libavcodec/cavs.h
libavcodec/cavsdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dnxhdenc.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/eamad.c
libavcodec/eatqi.c
libavcodec/g2meet.c
libavcodec/h261dec.c
libavcodec/h263.h
libavcodec/intrax8.c
libavcodec/ituh263dec.c
libavcodec/jvdec.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegdec.c
libavcodec/mjpegdec.h
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msmpeg4dec.c
libavcodec/ppc/Makefile
libavcodec/ppc/blockdsp.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/proresdec.h
libavcodec/proresdec2.c
libavcodec/vc1dec.c
libavcodec/wmv2.c
libavcodec/wmv2dec.c
libavcodec/x86/Makefile
libavcodec/x86/blockdsp_mmx.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h