[FFmpeg-devel] ffmpegs future version control system

[Måns Rullgård]

Luca Barbato <lu_zero at gentoo.org> writes:

> M?ns Rullg?rd wrote:
>> If anyone knows a way to merge those into one I'm all ears.
>
> use git-svn to import ffmpeg and swscale in separate branches, adjust
> the paths in swscale with git mv, git merge.

Hmm... I can't quite work out from the man page how this should be done...

-- 
M?ns Rullg?rd
mans at mansr.com