Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken