Merge "Fix integer overflow in MPEG4Extractor"