Changeset 707e8612 in ffmpeg

Timestamp:

May 4, 2011, 2:06:26 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3acc44b7

Parents:

b5f20892 (diff), 8ce67bca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)