conflicts ffmpeg-svn
