Merge "Fix integer overflow when handling MPEG4 tx3g atom" into klp-dev