Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams"