[FFmpeg-cvslog] Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  9 14:12:19 2014 +0100| [2830f287e2f271bcf773f645e5d9cb9aa5204f7f] | committer: Michael Niedermayer

Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'

* commit 'ebfe622bb1ca57cecb932e42926745cba7161913':
  mpegvideo: drop support for real (non-emulated) edges

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_motion.c
	libavcodec/wmv2.c

If this is slower on a major platform then it should be investigated
and potentially reverted.

See: 8fc52a5ef94712d900fc8fe7503cf9c9ba635143
See: 3969b4b861ce8152e3195e8f8c3437abd273b90a
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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