[FFmpeg-cvslog] Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  7 15:54:17 2014 +0200| [3790801f9cedfae81cb8f055bbb0b14131459658] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3790801f9cedfae81cb8f055bbb0b14131459658
---