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-05-30 23:15:20 +02:00
2014-06-22 17:58:28 +02:00
2014-06-19 04:54:38 +02:00
2014-06-19 04:54:38 +02:00
2014-07-01 15:22:11 +02:00
2014-07-01 15:22:11 +02:00
2014-03-20 21:51:17 +01:00
2014-06-19 01:01:14 +02:00
2014-06-19 01:01:14 +02:00
2014-06-19 01:01:14 +02:00
2014-06-11 02:50:50 +02:00
2014-06-11 02:50:50 +02:00
2014-06-11 02:50:50 +02:00
2014-06-11 02:50:50 +02:00
2014-06-11 02:50:50 +02:00
2014-03-22 23:17:03 +01:00
2014-06-11 02:22:53 +02:00
2014-07-01 15:22:11 +02:00
2014-06-11 02:22:53 +02:00
2014-07-01 15:22:11 +02:00
2014-06-11 02:50:50 +02:00
2014-06-11 02:50:50 +02:00
2014-06-23 21:10:10 +02:00
2014-06-11 02:22:53 +02:00
2014-06-11 02:50:50 +02:00
2014-06-11 02:50:50 +02:00
2014-06-11 02:50:50 +02:00
2014-06-11 02:50:50 +02:00