Fixed mishandling of video files
Improved video fix
Merge branch 'master' into libav0.9