Merge "Fix Unsigned-integer-overflow in MPEG4Extractor" into tm-qpr-dev