Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbread