Michael Niedermayer 707e8612e8 Merge remote branch 'qatar/master' ...

* qatar/master:
  Implement fate-rsync target
  Make ffmpeg support generic data stream

Conflicts:
	cmdutils.h

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

2011-05-04 04:06:26 +02:00

8.2 KiB

Raw Blame History

View Raw