Merge "Give PSP and QuickTime compatible mp4 files a chance to play"