minor tweaks
Merge branch 'master' of https://github.com/chinshou/FFmpeg
remove gdi device