Actually clean, untouched ffmpeg 2.1.3 now.
.gitignore fixups for bundled ffmpeg