Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 12:38:57 +0000 (14:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 13:22:11 +0000 (15:22 +0200)
commit581b5f0b9b93969712e73e0ae6324bbd03e85d4e
treed1319dc7744ac67e6ebd3379f11ff6e4a8178dc1
parent909f53f2b285bc7dbe77d4690a03f3d114417297
parente3fcb14347466095839c2a3c47ebecff02da891e
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context

Conflicts:
configure
libavcodec/aic.c
libavcodec/arm/Makefile
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/asvdec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dvdec.c
libavcodec/dxva2_mpeg2.c
libavcodec/intrax8.c
libavcodec/mdec.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc_common.h
libavcodec/mpegvideo.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
84 files changed:
configure
doc/optimization.txt
libavcodec/Makefile
libavcodec/aic.c
libavcodec/arm/Makefile
libavcodec/arm/dsputil_arm.h
libavcodec/arm/dsputil_armv6.S
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/idctdsp_arm.S
libavcodec/arm/idctdsp_arm.h
libavcodec/arm/idctdsp_armv6.S
libavcodec/arm/idctdsp_init_arm.c
libavcodec/arm/idctdsp_init_armv5te.c
libavcodec/arm/idctdsp_init_armv6.c
libavcodec/arm/idctdsp_init_neon.c
libavcodec/arm/idctdsp_neon.S
libavcodec/asv.c
libavcodec/asv.h
libavcodec/asvdec.c
libavcodec/asvenc.c
libavcodec/cavs.c
libavcodec/cavs.h
libavcodec/cavsdsp.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dvdec.c
libavcodec/dxva2_mpeg2.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatqi.c
libavcodec/g2meet.c
libavcodec/h263.c
libavcodec/idctdsp.c
libavcodec/idctdsp.h
libavcodec/intrax8.c
libavcodec/libavcodec.v
libavcodec/ljpegenc.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegdec.c
libavcodec/mjpegdec.h
libavcodec/mjpegenc_common.c
libavcodec/mjpegenc_common.h
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_xvmc.c
libavcodec/msmpeg4.c
libavcodec/nuv.c
libavcodec/ppc/Makefile
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/idctdsp.c
libavcodec/proresdec2.c
libavcodec/proresdec_lgpl.c
libavcodec/proresdsp.c
libavcodec/rtjpeg.c
libavcodec/rtjpeg.h
libavcodec/vaapi_mpeg2.c
libavcodec/vaapi_mpeg4.c
libavcodec/vc1dec.c
libavcodec/wmv2.c
libavcodec/wmv2dsp.c
libavcodec/x86/Makefile
libavcodec/x86/cavsdsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/idct_mmx_xvid.c
libavcodec/x86/idct_sse2_xvid.c
libavcodec/x86/idctdsp.h
libavcodec/x86/idctdsp_init.c
libavcodec/x86/idctdsp_mmx.c
libavcodec/x86/mpegvideoenc_template.c
libavcodec/x86/proresdsp_init.c
libavcodec/x86/simple_idct.c
libavfilter/vf_spp.c
libavfilter/vf_spp.h