VLC
Media Convert/Save
Add Audio or video
Convert/Save
MP4 - wrench
Radio button select MP4/MOV
Video Codec TAB / Check Keep original Track
Audio Codec TAB / Check Keep original Track
Destination
Start