Revert "Fix libmp4v2 build"

This reverts commit c8f76fa83ad43afd118acd15410a294cec5d537e.
Fix libmp4v2 build: more thorough patch