Sync'd version from GPAC SVN repo