[FFmpeg-cvslog] Merge remote branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Wed May 4 04:33:29 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 4 04:06:26 2011 +0200| [707e8612e85ba83fcbbfc56be3f4ab24af7e98fb] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=707e8612e85ba83fcbbfc56be3f4ab24af7e98fb
---
More information about the ffmpeg-cvslog
mailing list