« Previous | Next » 

Revision 3c849307

ID3c8493074bc43aced247a34d6b981e6f9acde0f1
Parent b0efaee6, 1500be13
Child 2ee85c06

Added by Michael Niedermayer over 9 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted