restore old codes
mp4v2: import r504
Merge branch 'mp4v2-tracking'
Merge branch 'master' of github.com:k-takata/mp3infp