Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"