Fix video/audio ordering
Merge pull request #15 from ellisonleao/master

Fix audio/video ordering