am 6874362a: am 04fdd180: Merge "fix [2542425] memory leak during video recording" into froyo

Merge commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47' into kraken

* commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47':
  fix [2542425] memory leak during video recording