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-29 16:26:38 +02:00
2014-06-28 13:11:32 +02:00
2014-06-18 12:59:15 -08:00
2014-06-25 01:00:05 +02:00
2014-06-20 12:12:46 +02:00
2014-04-29 13:25:59 +02:00
2014-06-14 19:45:53 +02:00
2014-06-03 10:58:19 -08:00
2014-06-30 15:36:26 +02:00
2014-05-23 23:30:21 +02:00
2014-06-24 00:35:16 +02:00
2014-06-14 22:54:32 +02:00
2014-06-30 21:53:14 +02:00
2014-06-18 14:55:28 +02:00
2014-06-12 21:31:25 +02:00
2014-04-12 14:34:11 +02:00
2014-06-18 23:13:31 +02:00
2014-05-29 01:13:59 +02:00
2014-07-01 15:22:11 +02:00
2014-05-28 03:52:50 +02:00
2014-06-23 01:30:35 +02:00
2014-06-20 10:21:31 -08:00
2014-05-26 21:28:19 +02:00