Michael Niedermayer 2d5e9451de Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
  dsputil: Split off pixel block routines into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pixblockdsp_template.c
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-10 01:22:14 +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