Bug 824099 - don't crash and ignore m4v movies and trash in the music metadata parser r=dkuo a=blocking+
Bug 825615 - scale small videos up to screen size when playing them. r=daleharvey a=blocking+
Merge pull request #7273 from davidflanagan/bug825615

Bug 825615 - scale small videos up to screen size when playing them. r=daleharvey a=blocking+
Merge pull request #7271 from davidflanagan/bug824099

Bug 824099 - don't crash and ignore m4v movies and trash in the music metadata parser r=dkuo a=blocking+
Auto-merge from branch 'master'