Merge "Fix double free in MPEG4Extractor"