ffmpeg/libavfilter
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-03 10:58:19 -08:00
2014-02-26 16:37:59 +00:00
2014-02-26 16:37:59 +00:00
2014-01-19 17:12:40 +01:00
2014-02-26 16:37:59 +00:00
2014-05-03 20:08:18 +02:00
2014-01-19 17:12:50 +01:00
2014-06-29 13:26:04 +02:00
2014-06-03 10:58:19 -08:00
2013-01-05 05:21:44 +01:00
2013-09-30 08:47:40 +00:00
2013-09-12 14:01:43 +00:00
2014-06-22 20:49:00 +02:00
2014-06-24 21:43:40 +02:00
2014-05-20 00:00:44 +02:00
2014-06-24 03:16:53 +02:00
2014-06-03 10:58:19 -08:00
2014-06-29 13:26:12 +02:00
2014-02-07 09:33:56 +01:00
2014-06-18 00:07:12 +02:00
2014-06-03 10:58:19 -08:00
2014-01-19 17:13:02 +01:00