Merge "Fix integer underflow in covr MPEG4 processing"