Merge "MPEG4Writer:Avoid deadlock when reset internally"