Michael Niedermayer 581b5f0b9b 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>
2014-07-01 15:22:11 +02:00
..
2014-06-08 02:37:20 +02:00
2014-06-08 02:37:20 +02:00
2014-04-11 12:09:09 +02:00
2014-02-24 08:30:19 +01:00
2014-05-21 03:25:08 +02:00
2014-06-25 14:49:44 +02:00
2014-05-29 21:47:40 +02:00
2014-06-05 20:31:59 +02:00
2014-04-19 09:56:01 +02:00
2014-04-19 09:56:01 +02:00
2014-05-21 03:25:08 +02:00
2014-06-08 02:37:20 +02:00
2014-03-29 18:13:15 +01:00
2014-04-19 09:56:01 +02:00