Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af' * commit 'bc1452a307ac61ca87bf78722701ac85100952af': Remove unused/debugging code from MP4 file writer
Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af' * commit 'bc1452a307ac61ca87bf78722701ac85100952af': Remove unused/debugging code from MP4 file writer