Merge remote-tracking branch 'newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Mar 2011 00:40:18 +0000 (01:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Mar 2011 00:40:18 +0000 (01:40 +0100)
commit3c8493074bc43aced247a34d6b981e6f9acde0f1
tree99b7984ed8e49d397c4cb3dab184454e26e122f1
parentb0efaee6c1a07b4e7575bf523542ce846202b6e2
parent1500be13f204acb7e74dac4325ef0052576fa2a9
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>
libavcodec/dsputil.c
libavcodec/mpegvideo.c
libavcodec/x86/dsputil_mmx.c