Merge "MPEG4Extractor: still more NULL dereference fixes"