Michael Niedermayer 3790801f9c Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
	libavcodec/mpegvideo_enc.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-07 16:17:27 +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-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