Merge "Refactor MPEG4Writer::writeTrackHeader() method"