Michael Niedermayer 2830f287e2 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: 8fc52a5ef9
See: 3969b4b861
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-01-09 14:19:24 +01:00

64 KiB

Raw Blame History

View Raw