Bug 971141 - make sure we don't leak memory when creating video thumbnails during scanning
Merge pull request #16531 from russnicoletti/bug-971141

Bug 971141 - make sure we don't leak memory when creating video thumbnails. r=johu