Merge "Fix buffer leak in MPEG4Extractor"