Michael Niedermayer 3c8493074b Merge remote-tracking branch 'newdev/master' ...

* newdev/master:
  dsputil: allow to skip drawing of top/bottom edges.
  Split fate-psx-str-v3 into a video-only and audio-only test.

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo.c
	libavcodec/snow.c
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-03-27 01:40:18 +01:00

154 KiB

Raw Blame History

View Raw