Extracted from a patch by Erik Hovland, erik hovland org.
--Thii line, and those below, will be ignored--

M    ffmpeg.c
M    ffplay.c
M    ffserver.c
M    vhook/watermark.c
M    libavformat/sol.c
M    libavformat/smacker.c
M    libavformat/siff.c


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13531 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b